options optimized
option renames
Merge remote-tracking branch 'origin/master' into BMI