Merge pull request #41 from Mchapuis/master

ggeeetettete
Merge pull request #33 from mysteriosum/master

fds