added stderr redirection to stdout
Merge branch 'master' of github.com:moul/junk