Release 1 1 4

Merging changes from latest release to Master