Merge pull request #12 from KrasnikovEugene/master