Update + test
Merge branch 'master' of https://github.com/tibijejczyk/TheMinecraft.git