feature 1
Merge pull request #4 from mlessard/feature1

feature 1