added comments
change from master
merge fixed