Merge pull request #81 from travier/stderrfix