--GEP-52, fixed fatal error
Merge pull request #26 from pradpnayak/GEP-52

--GEP-52, fixed fatal error