Fixed build
Removed demo
Updated to honor lifetimes