Updated usage and demo app