Graham - Fixes #517
Merge pull request #555 from kfinity/master

Graham - Fixes #517