Fix Issue #853
Merge pull request #858 from pindexis/develop

Fix Issue #853