Feature/line numbers

It's based on PR #3, tell me when you merge that. I'll rebase this one.