Fixes issue #72
Merge branch 'master' into develop