merge with master v1.1