Version 1.2 - Modifications based on feedback received on LightHouse

Tickets resolved #226, #227, #228, #229, #230 and #231