Merge pull request #1 from Kolpa/master

Update