Merge pull request #30 from makinacorpus/master

Merge pull request #29 from makinacorpus/stable
Merge pull request #34 from makinacorpus/stable

Merge pull request #30 from makinacorpus/master