1.0 Beta Merge

Merge 1.0 Alpha into 1.0 Beta