Putting settings into 1.1.4
Merge branch '1.1.4' into development