Merge pull request #27 from timolson/develop

DemoStrategy