v 1.1 merge from master