Some preliminary work
Merge pull request #13 from d-faure/master

Some preliminary work