feature 1
Merge pull request #3 from mlessard/feature1

feature 1