Merge pull request #67 from nhr/master

Better remote host testing plus fixed standalone ENV handling