Fixed missing options end tag
Removed a tags inside options
Merge remote-tracking branch 'origin' into release