Merge branch 'develop'
Added func value_or_eval()
Merge branch 'master' into develop