master
 - fixing comments