fixed wrapper functions instead of making them variables...
Merge branch 'master' of https://github.com/lteamcs98/graphics