Minor cleanup
Update demo
Bump up version