Fix memory issue.
Argument parsing fix.
Merge branch 'master' into generation

Conflicts:
	renderer.c
Fix bugs resulting from iffy merge