Merge pull request #2 from brookman-holmes/test

big update