Develop

Pulled in changes from pre 1.1.0.