Prepare 1.4.1 release
[2.0] Refactor