Merge branch 'issue85' of git.gmu.edu:srct/go into issue85

This merge should be already done, i belive this is just git being annoying
2 jobs for issue85 in 1 minute and 25 seconds (queued for 6 minutes and 26 seconds)