Develop

Rebase with Production 1.0 branch.
Added GA.