Merge branch 'feature/issue/20' into develop

closes #2, #20