More robust token searching
Implemented demo application