Merge pull request #27 from StreamSH/issue-24

Issue 24
Merge pull request #28 from StreamSH/development

Merge pull request #27 from StreamSH/issue-24