destroyedlolo Merge pull request #6 from destroyedlolo/Dev