added option parsing
9 files changed