Version 1.3 - Modifications based on feedback received on LightHouse

Resolved Tickets - #134, #225, #252 and #253