aplus#10 #12

Open
tribikram wants to merge 5 commits from aplus#10 into master