DemoStrategy

merged dev to make DemoStrategy run