backported more annotation fixes
Fixed #47 Input with character = 0240 (octal) should fail
Merge remote-tracking branch 'upstream/master'