Fixing classpath/Adding demo mode