Matt's help with getting everything working.
Merge pull request #22 from meltcaleb/master

Matt's help with getting everything working.