Many changes for upcoming version 1.1.3