Merge code from Dynamo/master

- Updated to latest codebase.