Merge pull request #245 from menny/master

Work for v114
Merge pull request #251 from menny/master

V115