Merge pull request #24 from HN23/issue-6

Issue 6