Issues #179 and #180
Merge branch 'issue180' into develop