merged master and shashank

some