Merge pre 1.1.1 with master