Removed deprecated method statements
Fixed API error handling
Merge branch 'master' into Tests