4.0.0.2-release

Major improvement and fix