feature 2
Merge pull request #7 from mlessard/feature2

feature 2