Jira/qd 50

https://bugs.indeed.com/browse/QD-50

Merge the 2 commits from #292
Merge the 2 commits from lukeweber@04d47d0
switch error output to go to stderr