Merge pull request #3 from minetest/master