Merge pull request #547 from meiti/master

fixes #546