Merge pull request #686 from heatherleaf/develop

Fix for issue #685