Merge pull request #158 from reem-utils/roger_branch

Roger branch
Update of part find me in what did you say
Merge pull request #159 from reem-utils/cris_branch

Update of part find me in what did you say
test of basic functionalities