Connor revisions 2

Connor rev 2
Merge pull request #11 from cegaudet/patch-3

Connor revisions 2