some more things
Merge pull request #29 from guywithnose/master

some more things