added test cases and fixed bug with some corner cases
fixed vocals
Merge remote-tracking branch 'github/Iteration6'