Merge pull request #229 from menny/master

Merging work for Release v114