other stuff
Merge pull request #28 from guywithnose/master

other stuff