Fixed Issue #13
Merge pull request #22 from ansani/master

Fix Issue #13