Merge branch 'lanes'

Closes #13