add --auto argument
Merge branch 'shark0der-master'