Working on issue #9
Working on issue #12
Finished issue #12
Merge branch 'dev-issue-#9' into dev-issue-#12