Include line number with syntax errors
Contains changes suggested in #184
Merge pull request #185 from jazzdan/dev

Include line number with syntax errors