Merging edits to view
Merge branch 'master' of https://github.com/JoshDaly/TrackM