more work
Merge pull request #24 from TCollier92/master

hohooo