New command line options
Add demo file