Check bounds
prevent duplicated annotation print
move annotate1 as inner function
declare before defining to fix compile error
chop off annotation instead of attempting to access out-of-bounds index
go through the string as unicode and not bytes
Merge pull request #1 from sourcegraph/master

latest from upstream