Updated deprecated values; fixed warnings
Merge pull request #8 from acoomans/master

Updated deprecated values