Merge pull request #22 from Jagadees-zyxware/master