version 1.1

to merge