Thunder07 Merge pull request #6 from Thunder07/clean