Merge branch 'issue/31' into develop