fix comments
merge with master