Merge pull request #402 from pastephens/master

release changes