final commit I hope
Merge pull request #4 from ddessaunet/dev

final commit I hope