Merged dev into master for 1.0 release

Deprecating 0.x branch (see tag 0.2.7) and pushing dev into master.