Merge pull request #13 from makinacorpus/stable

Stable
Merge pull request #14 from makinacorpus/stable

Stable
Merge pull request #15 from makinacorpus/stable

Stable
Merge pull request #17 from makinacorpus/master

1