Demo updated in master, ported here.