Bug fix? Wasn't working on EOS
Merge branch 'master' of ssh://github.com/ohearnk/CS467