Develop

Pulled in pre 1.1.0 changes.