This commit resolves #38
Merge pull request #43 from wistcc/master

Resolving issue 38