#addClass and #removeClass for customization
Merge branch 'classes'