More stuff fixed
Merge branch 'blackhat14eu' of https://github.com/jesusprubio/bluebox-ng into blackhat14eu