Merge pull request #4 from CasaTeam/master

Merge pull requests #3, #9, #10
Merge pull request #11 from sawyerlin/master

Merge pull request #4 from CasaTeam/master