Merge pull request #1 from msjit/master

Updates
Merge remote-tracking branch 'tcdbharshit/master' into develop