Reorganizing options

Fixed #61