Issue39
#558 pull fixes
Issue40 fix
Merge pull request #558 from dhanya/issue39

Issue39
issue40
Merge pull request #562 from dhanya/issue40

Issue40 fix