Fix scan, add user help
Merge branch 'antonin'