Merge pull request #18 from HN23/issue-6

Issue 6
Merge branch 'master' into issue-6