Merge pull request #103 from enesvold/CRA-505

Cra 505
#CRA-687, #CRA-692