include minor changes from develop branch