Merge pull request #305 from brentwalther/master