et#36 #37

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