Merge pull request #278 from menny/master

work for v118