Merge pull request #1 from uhulinux/master

frissítés
Merge pull request #2 from attuska/master

Merge pull request #1 from uhulinux/master