[Issue #84] Only --token option actually works