Merge pull request #1 from gsbodine/develop

Merge develop into master - 0.9