Merge pull request #482 from leoarnold/master