added shubam and tufels code
Merge origin/master