Minor fixes
Merge pull request #11 from MulgaSoft/dev

Minor fixes
Merge remote-tracking branch 'upstream/master' into uli-lunatest - 4.06