add functions
add tests
add documentation
refactor
Merge commit 'fd3d7b15f9a3eac536975c966feb41e1d989b67b'

Conflicts:
	README.md