Added the function to enable ajax with no attributes.
Fixed option key value bug.
Merge remote-tracking branch 'origin/master'