Merge pull request #60 from amergey/master