fix for issue #21
Merge pull request #22 from spenoir/master

fix for issue #21