updated readme
fixed a few tests
adjusted hints for command and span
fixed bug with line numbers and one with special characters
Merged upstream master