Saturday changes
Merge pull request #2 from brendonbeebe/master

pull saturday stuff