Merge pull request #44 from Mchapuis/master

just a pull nbd
Merge pull request #45 from Mchapuis/master

here's a pull
Merge pull request #36 from mysteriosum/master

hkgj