final proposal
Merge pull request #3 from jlbernard/master

final proposal