Merge conflicts
Merge pull request #113 from JustBuild/master

Master to Development
Updated GA code
Merge pull request #119 from JustBuild/development

Development