Close #10
Merge branch 'development-issue-10'
Fixes #6
Merge branch 'development-issue-6'