stashing changes to merge with brookes, master
trying this again
whatever
just some cleaning up
Merge pull request #17 from PopeOnARope/master

trying this again