Merge pull request #240 from rvraghav93/develop

Fixes #239