merged down Issue-6 updates