Fix deprecation warnings for should
Merge pull request #1 from istickz/master

Fix deprecation warnings for should