Removing deprecation warnings (fixes #360).
Merge pull request #365 from narrowfail/master

Removing deprecation warnings (fixes #360).