fix regression when using --inbound
fix retro compatibility issue with the --persist option
Merge pull request #150 from parkouss/regression-fixes

Regression fixes