Merge changes from sethusrinivasan:master to sethusrinivasan:dev

Pull request on Nov 2nd