Fixed demo issues

Fixed up demo to use proper 'match' signature
Updated demo
Merge pull request #15 from patocallaghan/dev

Fixed Demo Issues