v1.4.0 bug fix and improvements