Merge branch 'devlopment' of https://github.com/jsasky/CommOnOff.git into devlopment