fixed comments
readme file updated
fixed merge issues