forgotten stuff
Merge remote-tracking branch 'upstream/master'
Merge pull request #75 from pisi79/master

forgotten stuff