Combination of my efforts
Merge branch 'master' of https://www.github.com/zgmorris13/poopsmith