Starting work on issue #74
Issue #74 fixed.
Merge branch 'issue74' into develop