Merge branch 'master' of Nekocraft/PreciousStones