Merge pull request #27 from Mchapuis/master

fweatgret
Merge pull request #18 from mysteriosum/master

changez