some stuff
Merge branch 'master' of https://github.com/erohenshin/C0NS0LEC0WB0Y