Fixed flamerobin
Merge branch 'master' of github.com:elken/blackarch