fixed gapi...
Merge branch 'master' of https://github.com/hsdxpro/Unnamed-Team