Merge pull request #3 from Syleron/dev

Dev
Merge pull request #4 from Syleron/master

Merge pull request #3 from Syleron/dev