Version 0.4.0 (rework)