Merge pull request #1 from collective/master

Lastest code pull request ?