Issue #69: code complete
Merge branch 'feature/issue-69' into dev