Merge pull request #3 from yogeshd/master

from fork to core
yogi chaning in the dev branch
issue53 related changes