et#31 #32

Open
tribikram wants to merge 2 commits from et#31 into master