Fixed for latest code and moved to github.go