Cleaning up main.
Merge branch 'master' into parse-temporal

Conflicts:
	src/main.c