Merge pull request #81 from varatada/master