Merge pull request #1 from BuildCraft/master

Update