Merge pull request #34 from hgolsen/CRA-505

Cra 505: Merge 14/08.
#CRA-577
Merge pull request #36 from enesvold/CRA-505

#CRA-577, #CRA-574
CRA-505: Merge with enesvold.