Fixed bug with PNG graphics, minor changes to option parsing source code