Merge pull request #22 from menny/master

work toward v118