new ENTRY POINT
Merge branch 'master/0.2.0.2' into dev