Merge pull request #2 from brookman-holmes/test

big update
Merge pull request #3 from brookman-holmes/master

Merge pull request #2 from brookman-holmes/test