Adding set_action() call
Adding class support
???
Merge branch 'mainstreammaster'