v0,9

some are lazy copy/paste
Merge pull request #25 from tomByrer/patch-1

v0.9