fix 8
8a
Merge pull request #9 from maanenh2/bug/fix/8b

Bug/fix/8b