Merge pull request #15 from KrasnikovEugene/master