Issue #66 - Code Complete
Merge branch 'feature/issue-66' into dev