Merge pull request #5 from nnutter/master

you
hey you guys