feature 2
Merge pull request #6 from mlessard/feature2

feature 2