Merge branch 'issue/50' into develop