et#4 #5

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