Fix issue 11
Merge pull request #12 from jupiter24/issue11

Fix issue 11