Added -s | --short option (useful from scripting)