Merge pull request #4 from sawyerlin/master

Merge to CasaTeam