Use non-deprecated functions becuz they are better
Merge pull request #13 from humanmade/new-functions

Use non-deprecated functions