Merge Develop. Version bump to 1.1.8