basic comments
merge with origin master