Merge pull request #111 from enesvold/CRA-505

Cra 505
#CRA-701 Some minor bug fixes
Merge branch 'CRA-505' of https://github.com/CRAVA/crava into CRA-505