Fixes issue 119
Merge branch 'issue_119' into develop