Final Proposal v2
Merge pull request #4 from jlbernard/master

Final Proposal v2