Fixes for #393
Merge branch 'master' of https://github.com/ikeough/Dynamo