Merge pull request #162 from apenney/130-release