Four commit
Merge pull request #1 from Maltor/hotfix

Four commit