Version 1.1 - Modifications based on feedback received on LightHouse

Tickets resolved - #170, #196, #198, #199, #201, #202, #204, #206, #208, #210