#CRA-577
Merge pull request #36 from enesvold/CRA-505

#CRA-577, #CRA-574