Add additional logic for dynamic setting of value
Merge branch 'master' of https://github.com/elisapp/elis-live