added a test for clarifying behavior
Merge remote branch 'origin/master'