CGA WIP
Merge pull request #9 from Alegend45/master

CGA WIP