Major upgrade to v1.4.0