Merge pull request #80 from AlexanderPavlenko/master