Update deprecated idioms
Merge pull request #1 from Mouq/patch-1

Update deprecated idioms