functions: last touches (issue #4)
Merge pull request #16 from rafacm/functions

functions: last touches (issue #4)