heeehhehe
Merge pull request #2 from Syleron/dev

heeehhehe