adding comments update
updated comments
merge with master