Merge pull request #21 from bravikov/master