Merge pull request #81 from nhr/master

Additional fixes from QE feedback