Summary of changes from GH #25