Added option -o and comments