Merge pull request #6 from fingon/bugfix