feature 4
Merge pull request #2 from mlessard/feature4

feature 4