Catching up 2:06
Merge pull request #69 from gmckercher/master

Catching up 7/7 2:06