making develop branch friendly to merge into master