Example app, update documentation and few bug fixes