Merge pull request #2 from CasaTeam/master