Added wrapper and demo app