Updated opt (not done yet)
Merge remote-tracking branch 'origin/master'