Merge pull request #1 from tpoisot/master

Update on Tim's repository
Dom edits on the peer J version
Merge pull request #1 from DominiqueGravel/master

Dom's edits on the Peer J version