Merge pull request #30 from mysteriosum/master

pulling
Merge pull request #31 from mysteriosum/master

stuff
Merge pull request #40 from Mchapuis/master

fbvde