merge changes from develop branch - general code improvements