Merge pull request #60 from daejunpark/options

Cleanup options
CLEANUP_OPTIONS: Add a change-log