Various updates from production use
Merge pull request #5 from dustindoiron/master

Various updates from production use