Fix issue #6
Merge pull request #11 from chindit/master

Fix issue #6