fixed merge issues
Merge pull request #14 from vamshiImaginea/master

fixed merge issues