diff --git a/cmd/commands/command.go b/cmd/commands/command.go
index cab663f..def6e42 100644
--- a/cmd/commands/command.go
+++ b/cmd/commands/command.go
@@ -42,6 +42,7 @@ type Command struct {
 
 var AvailableCommands = []*Command{}
 var cmdUsage = `Use {{printf "bee help %s" .Name | bold}} for more information.{{endline}}`
+var CmdName = "go"
 
 // Name returns the command's name: the first word in the Usage line.
 func (c *Command) Name() string {
diff --git a/cmd/commands/dlv/dlv_amd64.go b/cmd/commands/dlv/dlv_amd64.go
index 9879fc3..7466ba6 100644
--- a/cmd/commands/dlv/dlv_amd64.go
+++ b/cmd/commands/dlv/dlv_amd64.go
@@ -228,7 +228,7 @@ func startWatcher(paths []string, ch chan int) {
 
 					// Wait 1s before re-build until there is no file change
 					scheduleTime := time.Now().Add(1 * time.Second)
-					time.Sleep(scheduleTime.Sub(time.Now()))
+					time.Sleep(time.Until(scheduleTime))
 					_, err := buildDebug()
 					if err != nil {
 						utils.Notify("Build Failed: "+err.Error(), "bee")
diff --git a/cmd/commands/migrate/migrate.go b/cmd/commands/migrate/migrate.go
index 92fa16e..da42d85 100644
--- a/cmd/commands/migrate/migrate.go
+++ b/cmd/commands/migrate/migrate.go
@@ -28,7 +28,7 @@ import (
 	"github.com/beego/bee/config"
 	"github.com/beego/bee/utils"
 
-	beeLogger "github.com/beego/bee/logger"
+	"github.com/beego/bee/logger"
 )
 
 var CmdMigrate = &commands.Command{
@@ -38,19 +38,19 @@ var CmdMigrate = &commands.Command{
 
   ▶ {{"To run all the migrations:"|bold}}
 
-    $ bee migrate [-driver=mysql] [-conn="root:@tcp(127.0.0.1:3306)/test"]
+    $ bee migrate [-gobin=go] [-driver=mysql] [-conn="root:@tcp(127.0.0.1:3306)/test"]
 
   ▶ {{"To rollback the last migration:"|bold}}
 
-    $ bee migrate rollback [-driver=mysql] [-conn="root:@tcp(127.0.0.1:3306)/test"]
+    $ bee migrate rollback [-gobin=go] [-driver=mysql] [-conn="root:@tcp(127.0.0.1:3306)/test"]
 
   ▶ {{"To do a reset, which will rollback all the migrations:"|bold}}
 
-    $ bee migrate reset [-driver=mysql] [-conn="root:@tcp(127.0.0.1:3306)/test"]
+    $ bee migrate reset [-gobin=go] [-driver=mysql] [-conn="root:@tcp(127.0.0.1:3306)/test"]
 
   ▶ {{"To update your schema:"|bold}}
 
-    $ bee migrate refresh [-driver=mysql] [-conn="root:@tcp(127.0.0.1:3306)/test"]
+    $ bee migrate refresh [-gobin=go] [-driver=mysql] [-conn="root:@tcp(127.0.0.1:3306)/test"]
 `,
 	PreRun: func(cmd *commands.Command, args []string) { version.ShowShortVersionBanner() },
 	Run:    RunMigration,
@@ -60,6 +60,7 @@ var mDriver utils.DocValue
 var mConn utils.DocValue
 
 func init() {
+	CmdMigrate.Flag.StringVar(&commands.CmdName, "gobin", "go", "go executable file path or alias")
 	CmdMigrate.Flag.Var(&mDriver, "driver", "Database driver. Either mysql, postgres or sqlite.")
 	CmdMigrate.Flag.Var(&mConn, "conn", "Connection string used by the driver to connect to a database instance.")
 	commands.AvailableCommands = append(commands.AvailableCommands, CmdMigrate)
@@ -289,7 +290,7 @@ func writeMigrationSourceFile(dir, source, driver, connStr string, latestTime in
 // buildMigrationBinary changes directory to database/migrations folder and go-build the source
 func buildMigrationBinary(dir, binary string) {
 	changeDir(dir)
-	cmd := exec.Command("go", "build", "-o", binary)
+	cmd := exec.Command(commands.CmdName, "build", "-o", binary)
 	if out, err := cmd.CombinedOutput(); err != nil {
 		beeLogger.Log.Errorf("Could not build migration binary: %s", err)
 		formatShellErrOutput(string(out))
diff --git a/cmd/commands/pack/pack.go b/cmd/commands/pack/pack.go
index becddcc..35a59e8 100644
--- a/cmd/commands/pack/pack.go
+++ b/cmd/commands/pack/pack.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/beego/bee/cmd/commands"
 	"github.com/beego/bee/cmd/commands/version"
-	beeLogger "github.com/beego/bee/logger"
+	"github.com/beego/bee/logger"
 	"github.com/beego/bee/utils"
 )
 
@@ -55,6 +55,7 @@ var (
 
 func init() {
 	fs := flag.NewFlagSet("pack", flag.ContinueOnError)
+	fs.StringVar(&commands.CmdName, "gobin", "go", "go executable file path or alias")
 	fs.StringVar(&appPath, "p", "", "Set the application path. Defaults to the current path.")
 	fs.BoolVar(&build, "b", true, "Tell the command to do a build for the current platform. Defaults to true.")
 	fs.StringVar(&buildArgs, "ba", "", "Specify additional args for Go build.")
@@ -508,7 +509,7 @@ func packApp(cmd *commands.Command, args []string) int {
 			fmt.Fprintf(output, "\t%s%s+ go %s%s%s\n", "\x1b[32m", "\x1b[1m", strings.Join(args, " "), "\x1b[21m", "\x1b[0m")
 		}
 
-		execmd := exec.Command("go", args...)
+		execmd := exec.Command(commands.CmdName, args...)
 		execmd.Env = append(os.Environ(), envs...)
 		execmd.Stdout = os.Stdout
 		execmd.Stderr = os.Stderr
diff --git a/cmd/commands/run/run.go b/cmd/commands/run/run.go
index 17f73db..6ef762e 100644
--- a/cmd/commands/run/run.go
+++ b/cmd/commands/run/run.go
@@ -28,7 +28,7 @@ import (
 )
 
 var CmdRun = &commands.Command{
-	UsageLine: "run [appname] [watchall] [-main=*.go] [-downdoc=true]  [-gendoc=true] [-vendor=true] [-e=folderToExclude] [-ex=extraPackageToWatch] [-tags=goBuildTags] [-runmode=BEEGO_RUNMODE]",
+	UsageLine: "run [-gobin=go] [appname] [watchall] [-main=*.go] [-downdoc=true]  [-gendoc=true] [-vendor=true] [-e=folderToExclude] [-ex=extraPackageToWatch] [-tags=goBuildTags] [-runmode=BEEGO_RUNMODE]",
 	Short:     "Run the application by starting a local development server",
 	Long: `
 Run command will supervise the filesystem of the application for any changes, and recompile/restart it.
@@ -66,6 +66,7 @@ var (
 var started = make(chan bool)
 
 func init() {
+	CmdRun.Flag.StringVar(&commands.CmdName, "gobin", "go", "go executable file path or alias")
 	CmdRun.Flag.Var(&mainFiles, "main", "Specify main go files.")
 	CmdRun.Flag.Var(&gendoc, "gendoc", "Enable auto-generate the docs.")
 	CmdRun.Flag.Var(&downdoc, "downdoc", "Enable auto-download of the swagger file if it does not exist.")
diff --git a/cmd/commands/run/watch.go b/cmd/commands/run/watch.go
index be547cb..a86f7fd 100644
--- a/cmd/commands/run/watch.go
+++ b/cmd/commands/run/watch.go
@@ -16,6 +16,7 @@ package run
 
 import (
 	"bytes"
+	"github.com/beego/bee/cmd/commands"
 	"os"
 	"os/exec"
 	"regexp"
@@ -85,7 +86,7 @@ func NewWatcher(paths []string, files []string, isgenerate bool) {
 					go func() {
 						// Wait 1s before autobuild until there is no file change.
 						scheduleTime = time.Now().Add(1 * time.Second)
-						time.Sleep(scheduleTime.Sub(time.Now()))
+						time.Sleep(time.Until(scheduleTime))
 						AutoBuild(files, isgenerate)
 
 						if config.Conf.EnableReload {
@@ -118,8 +119,6 @@ func AutoBuild(files []string, isgenerate bool) {
 
 	os.Chdir(currpath)
 
-	cmdName := "go"
-
 	var (
 		err    error
 		stderr bytes.Buffer
@@ -127,7 +126,7 @@ func AutoBuild(files []string, isgenerate bool) {
 	// For applications use full import path like "github.com/.../.."
 	// are able to use "go install" to reduce build time.
 	if config.Conf.GoInstall {
-		icmd := exec.Command(cmdName, "install", "-v")
+		icmd := exec.Command(commands.CmdName, "install", "-v")
 		icmd.Stdout = os.Stdout
 		icmd.Stderr = os.Stderr
 		icmd.Env = append(os.Environ(), "GOGC=off")
@@ -148,7 +147,7 @@ func AutoBuild(files []string, isgenerate bool) {
 	}
 	appName := appname
 	if err == nil {
-		
+
 		if runtime.GOOS == "windows" {
 			appName += ".exe"
 		}
@@ -160,7 +159,7 @@ func AutoBuild(files []string, isgenerate bool) {
 		}
 		args = append(args, files...)
 
-		bcmd := exec.Command(cmdName, args...)
+		bcmd := exec.Command(commands.CmdName, args...)
 		bcmd.Env = append(os.Environ(), "GOGC=off")
 		bcmd.Stderr = &stderr
 		err = bcmd.Run()
diff --git a/cmd/commands/version/version.go b/cmd/commands/version/version.go
index 779b758..8b902a4 100644
--- a/cmd/commands/version/version.go
+++ b/cmd/commands/version/version.go
@@ -48,7 +48,7 @@ const shortVersionBanner = `______
 `
 
 var CmdVersion = &commands.Command{
-	UsageLine: "version",
+	UsageLine: "version [-gobin=go] [-o=json] ",
 	Short:     "Prints the current Bee version",
 	Long: `
 Prints the current Bee, Beego and Go version alongside the platform information.
@@ -62,6 +62,7 @@ const version = "1.10.0"
 func init() {
 	fs := flag.NewFlagSet("version", flag.ContinueOnError)
 	fs.StringVar(&outputFormat, "o", "", "Set the output format. Either json or yaml.")
+	fs.StringVar(&commands.CmdName, "gobin", "go", "go executable file path or alias")
 	CmdVersion.Flag = *fs
 	commands.AvailableCommands = append(commands.AvailableCommands, CmdVersion)
 }
@@ -168,7 +169,7 @@ func GetGoVersion() string {
 		err    error
 	)
 
-	if cmdOut, err = exec.Command("go", "version").Output(); err != nil {
+	if cmdOut, err = exec.Command(commands.CmdName, "version").Output(); err != nil {
 		beeLogger.Log.Fatalf("There was an error running 'go version' command: %s", err)
 	}
 	return strings.Split(string(cmdOut), " ")[2]
diff --git a/generate/swaggergen/g_docs.go b/generate/swaggergen/g_docs.go
index 351a289..9d77b62 100644
--- a/generate/swaggergen/g_docs.go
+++ b/generate/swaggergen/g_docs.go
@@ -116,7 +116,7 @@ func ParsePackagesFromDir(dirpath string) {
 				err = parsePackageFromDir(fpath)
 				if err != nil {
 					// Send the error to through the channel and continue walking
-					c <- fmt.Errorf("Error while parsing directory: %s", err.Error())
+					c <- fmt.Errorf("error while parsing directory: %s", err.Error())
 					return nil
 				}
 			}
diff --git a/utils/utils.go b/utils/utils.go
index 13e50b1..75b6898 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -328,7 +328,7 @@ func CheckEnv(appname string) (apppath, packpath string, err error) {
 	apppath = filepath.Join(gosrcpath, appname)
 
 	if _, e := os.Stat(apppath); !os.IsNotExist(e) {
-		err = fmt.Errorf("Cannot create application without removing '%s' first", apppath)
+		err = fmt.Errorf("cannot create application without removing '%s' first", apppath)
 		beeLogger.Log.Errorf("Path '%s' already exists", apppath)
 		return
 	}