Updated based on QE feedback
Merge pull request #71 from nhr/master

Updated based on QE feedback