Fixed GAPI
Added credits to GAPI