Early draft.
Merge pull request #1 from Hywan/master

Early draft