Merge pull request #1 from fobiasmog/master

Merge pull request #1 from Zivilter/master
Merge pull request #2 from Zivilter/master

Merge pull request #1 from fobiasmog/master