final look
Merge https://github.com/SixTrack/SixTrackLib