Develop

Develop set as Master (end of beta 7 ; 0.4.1)