On branch master - temporary save

- work on front-end of reader