Merge pull request #27 from StreamSH/issue-24

Issue 24