Fixes issue #346 and Issue #347
Merge remote-tracking branch 'origin/develop' into develop