Merge pull request #28 from janakj/master