Fixed demo file and added more use cases.