Fix deprecated method calls so that this library would not break existing implementations that upgrade
Remove incorrect @Override annotations
Merge pull request #3 from mruthvend2l/master

Fix deprecated methods