veselcraft Merge pull request #2 from Craftplacer/master