Merge pull request #40 from Mchapuis/master

fbvde
Merge pull request #32 from mysteriosum/master

w3r