et#6 #7

Open
tribikram wants to merge 4 commits from et#6 into master