Fixed small API error and updated with master branch