Couple of improvement -> v1.2.0
merge