feature 4
Merge pull request #3 from mlessard/feature4

feature 4