Fixed [trid-defs]
Fixed [john]
Merge branch 'master' of https://github.com/izx64/blackarch into unstable