Merge pull request #27 from makinacorpus/stable

Stable