Add a function.
Merge remote-tracking branch 'maemual/master'