Merge pull request #1 from Mirage20/Mirage

Mirage
Merge branch 'master' of https://github.com/Mirage20/OOSD.git into Mirage