Merge pull request #5 from vishalseshagiri/master Former-commit-id: 92589442355e061414fef5e7bf502231003e6e90