super
Merge pull request #3 from nbarraille/dev2

[Delivers #123]