Merge pull request #82 from gorzell/master

Dynamo updates and Context Support