Simplify sample app
Fix bug
Merge pull request #1 from contexthub/simplify

Simplify