Specs passing
Added some actions to the controller
Merge branch 'options_api'