Merge pull request #23 from romcart/master

Fix Issue #22