aplus#18 #19

Open
tribikram wants to merge 2 commits from aplus#18 into master