Fix issue 57
Merge branch 'issue_57' into develop