Merge pull request #1 from AdrianTM/master

latest changes that kmathern made