Merge pull request #37 from makinacorpus/stable

Stable