et#14 #15

Open
tribikram wants to merge 5 commits from et#14 into master