Merge pull request #3 from CasaTeam/master

Pull request from 1.16 created by Hubo
Merge pull request #10 from sawyerlin/master

Merge pull request #3 from CasaTeam/master