Merge pull request #1 from Carduinodroid/master

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

Merge pull request #1 from Carduinodroid/master