Merge pull request #172 from ngoldman/master

add changelog