Merge with mdoege/Trail repository