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