kwargs on find_by_xxx
Merge branch 'master' of github.com:dmmartins/pirate