Fix for issue #518
Merge pull request #519 from markcowl/release-0.6.16

Fix for issue #518