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

Features 1 & 4