Merge pull request #1 from BuildCraft/mc16

Mc16