feature 2
Merge pull request #2 from mlessard/feature2

feature 2