add options & log
lint
fs
Merge branch 'rest-api'