fixes #314
Merge pull request #315 from gauravgopi123/github-314

fixes #314
Merge remote-tracking branch 'origin/master' into dev-0.9.1