Don't use deprecated functions
Use deleted functions if available
Merge pull request #12 from arsenm/master

Don't use the deprecated versions of functions