Doc and API changes
Merge branch 'master' of github.com:hugorodrigues/smart-function

Conflicts:
	README.md