Bugs fixing in APIs
Clean up code
Merge remote-tracking branch 'origin/artiom' into artiom