just some small things
Merge pull request #5 from andywenk/small-stuff

just some small things