Merge pull request #276 from menny/master

work toward v118