Move header parsing to its own function
Merge branch 'master' of github.com:atc-/cfr

Conflicts:
	src/class.c