Fixes #18
Merge pull request #22 from emrekilinc/fixes18

Fixes #18