Final commit before leaving on Tuesday.
Merge pull request #17 from meltcaleb/master

Final commit before leaving on Tuesday.