Use array in validation
Merge remote-tracking branch 'origin/add-a-controller' into gh-pages