Merge pull request #325 from apenney/merge