Fix method signature
remove deprecated methods
Merge branch 'master'