Merged

Merge branch 'master' of https://github.com/c5sire/licor

Conflicts:
	R/licor.R
Merge