Updated.
Updated demo project.