Merge pull request #2 from sushant26/test

from dev to master
first commit on test by tortoise