Merge pull request #1 from CasaTeam/master

Some Refactoring and Modification
Merge pull request #9 from comiscienceknight/master

Merge pull request #1 from CasaTeam/master