Cleanup
Update demos and readme to 2.1.0