new tests added
new tests added
Merge remote-tracking branch 'origin/master'