feature 2
feature 3
Merge pull request #5 from mlessard/feature2

feature 2
Merge pull request #6 from mlessard/qa

Feature 2 & Feature 3