second try, because i'm to dumb to do it right
Merge pull request #287 from x3nu/master

second try, because i'm to dumb to do it right