Fixing issue #704
Merge branch 'develop'