Added Options controller
Merge branch 'master' of github.com:kzimnicki/RefactorThisName