Merge pull request #8 from maanenh2/master

bug fix 7