Initial commit after package changed and Feedback changes done on 27th Feb 2014