Merge pull request #22 from fishermanswharff/master

geez, there's params flying around everywhere