improved config parser
Merge branch 'master' of https://github.com/carpikes/damping

Conflicts:
	damping.c