Fixing code to be aligned with API
Merge branch 'master' of github.com:thesp0nge/gengiscan