Merge branch 'master' of https://github.com/sacko87/h4x0r