Fixes issue 143
Merge branch 'issue_143' into develop