new test cases added (increase coverage);
prepared to merge with upstream/master;