hoi
Merge remote-tracking branch 'upstream/master'
Merge pull request #1 from Kranuh/master

First pull request