feature 4
feature 1
Merge pull request #6 from mlessard/qa

feature 1 & feature 4