Merge pull request #117 from Ashok-matrix/dev

Merge changes from Ashok into dev