Merge branch 'feature/issue/7' into develop