Update code from Kerkerkruip
Merge branch 'master' of https://github.com/i7/ATTACK