Merge pull request #363 from RealEnder/master