Fix issue #11
Merge pull request #12 from cznic/master

Fix issue #11