updated yote version
updated comments
merging in master