Merge pull request #42 from makinacorpus/stable

Stable
Merge remote-tracking branch 'origin/master' into stable