Release/0.4.0

Release 4.0 pull off Dev branch