Merge branch 'master' into dev-chris
General Updates
Bump version.
Merge pull request #64 from chrishumboldt/dev-chris

Dev chris