Renamed some variables
Merge branch 'master' of https://github.com/joonatansir/gg