Refactoring
Merge branch 'master' of https://github.com/n4n0lix/BlisterEngine