Start working on issue #21
Merge branch 'master' into dev-issue-#21
Closes issue #21 and #22