Merge KamikazeXeX's Edits
Merge pull request #2 from KamikazeXeX/master

Merge KamikazeXeX's Edits