Merge pull request #26 from Arthur200000/master

Modernize