Merge pull request #1 from CasaTeam/master

Some Refactoring and Modification