fix base api class
Merge branch 'master' into production