simplify
Merge pull request #2 from pjenvey/master

simplify