[Issue #16] Ported the demo to the requirements of greppy's issue #16.