Release 1

Merging the Release 1 branch back to Master.