Merge pull request #82 from asergeyev/master