Tidy up again and crank options default export.
Merge branch 'master' into Dev
Debugging
Merge branch 'Dev'