Merge pull request #116 from enesvold/CRA-505

Cra 700
#CRA-700, #CRA-704
Merge branch 'CRA-505' of https://github.com/CRAVA/crava into CRA-505