Merge pull request #65 from jangid/master