feature 3
Merge pull request #5 from mlessard/feature3

feature 3