Merge branch 'master' into test_options_controller
Merge pull request #26 from LightningLord/test_options_controller

Test options controller