#CRA-700, #CRA-704
Merge branch 'CRA-505' of https://github.com/CRAVA/crava into CRA-505
Merge pull request #118 from enesvold/CRA-505

CRA-700, CRA-704