added preconnect and exit options
Merge branch 'develop'