Issue #68 - problem appears resolved
Merge branch 'feature/issue-68' into dev