Fix for #398
Merge branch 'master' of https://github.com/ikeough/Dynamo