Merge branch 'master' into tool-for-adding-a-track
use privileged method
Merge pull request #57 from Trott/tool-for-adding-a-track

Tool for adding a track