Develop

Merge Develop for 1.0b release.