first commit
Merge github.com:grimoire/pastis_v0.1