Fix for issue #108
Merge remote-tracking branch 'origin/develop' into develop