merged recent changes into v1.1.1