rel #16; update demo to 3.1.0