Merge pull request #2 from evgeni/master