#CRA-701 Some minor bug fixes
Merge branch 'CRA-505' of https://github.com/CRAVA/crava into CRA-505
Merge pull request #113 from enesvold/CRA-505

Cra 701