Fixed bugs and changed structure so it will pass on Travis-CI
fixed godoc block