Merge pull request #31 from srijanaravali/master

Master
Merge pull request #3 from srijanaravali/dev-1.x

Merge pull request #31 from srijanaravali/master