Merge pull request #27 from makinacorpus/stable

Stable
Merge pull request #28 from makinacorpus/master

Merge pull request #27 from makinacorpus/stable