Applying partial pull request  #13 of mkurdej
Removing deprecation warnings