Merge pull request #1278 from samxli/develop

Added fix for issue #1277