Replaced some deprecated features
Merge pull request #1 from sillymoose/master

Replaced some deprecated features