Merge pull request #5 from ncollins/master

Replaced deprecated string functions.