feature 4
Merge pull request #1 from mlessard/feature4

feature 4