Merge pull request #75 from pisi79/master

forgotten stuff
tieni