extrtech#1 #2

Open
tribikram wants to merge 2 commits from extrtech#1 into master