Version 1.1.5 and proceeding versions

Lots of code being checked in here :-(