Implemented feedback

Feedback from Dinesh on 12 july 2014.