Addition of GA + bug fix
Merge pull request #22 from cts12/feature/simon

Addition of GA + bug fix