edit
Merge pull request #35 from kerautret/update0.8

edit