Test 798

Fixed #48 & #49
Test 798 -> Stable 42
Merge remote-tracking branch 'origin/tests'