Merge branch 'master' into tool-for-adding-a-track
whitespace consistency
revise lib and tests
Merge pull request #56 from Trott/tool-for-adding-a-track

Tool for adding a track