Added Olevel and march kw_options
Merge master