Merge pull request #3 from Syleron/dev

Dev