Option files can now have comment lines
Fixed some issues with build the header-only version