bugs removed
Merge branch 'master' of https://github.com/hellboy2k8/x_x_x