upgraded rigger to support bare option and added EOL normalization