version 1.1, see main.c for changelog
Version bump: 1.2
fixing git conflicts