Merged from Tom's update
Merge branch 'master' of https://github.com/tom335/ghTracker