Fixes #31
Merge pull request #50 from gateway4labs/achissue31

Merge pull request #50 from gateway4labs/achissue31