Issue #434
Merge branch 'master' of https://github.com/sudokode/blackarch into unstable