Proper setup of demo branch