Closes #70
Merge pull request #81 from abcdev/patch-issue-70

Closes #70