Issue40 fix
issue40
Merge pull request #562 from dhanya/issue40

Issue40 fix