working on options
merged and fixed conflicts with master