Merge pull request #323 from jmccrohan/master