Updated for Moolah's additions
Merge pull request #160 from meanelephant/patch-1

Updated for Moolah's additions