couple of fixups to make this easier to invoke via ssh
Merge pull request #291 from atmos/v3

Couple of fixups to make this easier to invoke via ssh