Merge pull request #37 from makinacorpus/stable

Stable
Merge pull request #38 from makinacorpus/master

Merge pull request #37 from makinacorpus/stable