For lib
Merge branch 'master' of github.com:lrtfm/parse_formula

Conflicts:
	makefile