Typo
Fix miscounting stop positions
Merge remote-tracking branch 'origin/master'