Merge pull request #3 from AndreyRybkin/master