fixes #11
Merge pull request #12 from Scrier/bug_fix_11

fixes #11