Do not put hyphens in function names.

http://tldp.org/LDP/abs/html/gotchas.html
Merge branch 'master' into edge