initial commit
Merge https://github.com/hutton/line