more stuff
Merge pull request #20 from niquecoryell/master

more stuff