Handle deprecation warnings a little more gracefully.
Merge pull request #41 from geraldcor/master

Handle deprecation warnings a little more gracefully.