Issue #54
- Added option to skip setup_remote