Fix Issue #31
Merge pull request #32 from akamensky/master

Fix Issue #31