* Minor cleanup
* Updated test
* Updated demo