Merge pull request #2 from royalaid/master

Update and SUPERMERGE
Project Cleaning