master
small changes