pushed to get latest
Merge branch 'master' of https://github.com/sendtomitesh/ET2.git
solved some design issues