650

please, review  branch issue 650