Merge pull request #8 from ulvmoen/master

CRA-523 Fixed bug in test case 1
Fixed some memory leakages in test case 2
Merge remote branch 'upstream/master'