Maquette v0.3
Merge pull request #8 from iKlem/maquette

Maquette to master (v0.4)