Function names withing dynamic expansion (fixes #2)
Merge branch 'dev'