Feature: change addon options
Merge branch 'feature-options' into dev