Merge branch 'master' into t003
Merge pull request #4 from brunokam/t003

Merge branch 'master' into t003