Added simple plot interface
parse.c conflict
Up to date commit