Merge branch 'issue/35' into develop