Merge branch 'iss21'
Merge pull request #22 from TheKojuEffect/master

Issue 21 resolved
Merge remote-tracking branch 'devops/master'
Merge branch 'develop'
Merge remote-tracking branch 'origin/master'