Changes for master

Pleas control