Feature/linenumber

Fixes #408