Merge pull request #2 from siudev/master

Merge pull request #3 from siudev/master
Merge pull request #17 from MelonS/master

Merge pull request #2 from siudev/master