final changes before pull to origin:master