Merge pull request #207 from tttp/bugfix