diff --git a/cmd/commands/api/apiapp.go b/cmd/commands/api/apiapp.go
index e1862be..53d313c 100644
--- a/cmd/commands/api/apiapp.go
+++ b/cmd/commands/api/apiapp.go
@@ -35,7 +35,7 @@ var CmdApiapp = &commands.Command{
   The command 'api' creates a Beego API application.
 
   {{"Example:"|bold}}
-      $ bee api [appname] [-tables=""] [-driver=mysql] [-conn=root:@tcp(127.0.0.1:3306)/test]
+      $ bee api [appname] [-tables=""] [-driver=mysql] [-conn="root:@tcp(127.0.0.1:3306)/test"]
 
   If 'conn' argument is empty, the command will generate an example API application. Otherwise the command
   will connect to your database and generate models based on the existing tables.
@@ -511,7 +511,7 @@ import (
 )
 
 func init() {
-	_, file, _, _ := runtime.Caller(1)
+	_, file, _, _ := runtime.Caller(0)
 	apppath, _ := filepath.Abs(filepath.Dir(filepath.Join(file, ".." + string(filepath.Separator))))
 	beego.TestBeegoInit(apppath)
 }
diff --git a/cmd/commands/dlv/dlv_amd64.go b/cmd/commands/dlv/dlv_amd64.go
index 6eda3fb..a61a5fa 100644
--- a/cmd/commands/dlv/dlv_amd64.go
+++ b/cmd/commands/dlv/dlv_amd64.go
@@ -227,7 +227,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/hprose/hprose.go b/cmd/commands/hprose/hprose.go
index 135070f..1d50581 100644
--- a/cmd/commands/hprose/hprose.go
+++ b/cmd/commands/hprose/hprose.go
@@ -24,7 +24,7 @@ var CmdHproseapp = &commands.Command{
 
   {{"To scaffold out your application, use:"|bold}}
 
-      $ bee hprose [appname] [-tables=""] [-driver=mysql] [-conn=root:@tcp(127.0.0.1:3306)/test]
+      $ bee hprose [appname] [-tables=""] [-driver=mysql] [-conn="root:@tcp(127.0.0.1:3306)/test"]
 
   If 'conn' is empty, the command will generate a sample application. Otherwise the command
   will connect to your database and generate models based on the existing tables.
diff --git a/cmd/commands/new/new.go b/cmd/commands/new/new.go
index 299f094..120efa2 100644
--- a/cmd/commands/new/new.go
+++ b/cmd/commands/new/new.go
@@ -101,7 +101,7 @@ import (
 )
 
 func init() {
-	_, file, _, _ := runtime.Caller(1)
+	_, file, _, _ := runtime.Caller(0)
 	apppath, _ := filepath.Abs(filepath.Dir(filepath.Join(file, ".." + string(filepath.Separator))))
 	beego.TestBeegoInit(apppath)
 }
diff --git a/cmd/commands/run/watch.go b/cmd/commands/run/watch.go
index be547cb..e87a6aa 100644
--- a/cmd/commands/run/watch.go
+++ b/cmd/commands/run/watch.go
@@ -85,7 +85,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 {
@@ -148,7 +148,7 @@ func AutoBuild(files []string, isgenerate bool) {
 	}
 	appName := appname
 	if err == nil {
-		
+
 		if runtime.GOOS == "windows" {
 			appName += ".exe"
 		}
@@ -183,9 +183,22 @@ func Kill() {
 		}
 	}()
 	if cmd != nil && cmd.Process != nil {
-		err := cmd.Process.Kill()
-		if err != nil {
-			beeLogger.Log.Errorf("Error while killing cmd process: %s", err)
+		cmd.Process.Signal(os.Interrupt)
+		ch := make(chan struct{}, 1)
+		go func() {
+			cmd.Wait()
+			ch <- struct{}{}
+		}()
+		select {
+		case <-ch:
+			return
+		case <-time.After(10 * time.Second):
+			beeLogger.Log.Info("Timeout; Force kill cmd process")
+			err := cmd.Process.Kill()
+			if err != nil {
+				beeLogger.Log.Errorf("Error while killing cmd process: %s", err)
+			}
+			return
 		}
 	}
 }
diff --git a/generate/swaggergen/g_docs.go b/generate/swaggergen/g_docs.go
index fe3a08d..3f918bf 100644
--- a/generate/swaggergen/g_docs.go
+++ b/generate/swaggergen/g_docs.go
@@ -32,7 +32,7 @@ import (
 	"strings"
 	"unicode"
 
-	"gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v2"
 
 	"github.com/astaxie/beego/swagger"
 	"github.com/astaxie/beego/utils"
@@ -124,7 +124,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
 				}
 			}
@@ -541,7 +541,7 @@ func parserComments(f *ast.FuncDecl, controllerName, pkgpath string) error {
 	//TODO: resultMap := buildParamMap(f.Type.Results)
 	if comments != nil && comments.List != nil {
 		for _, c := range comments.List {
-			t := strings.TrimSpace(strings.TrimLeft(c.Text, "//"))
+			t := strings.TrimSpace(strings.TrimPrefix(c.Text, "//"))
 			if strings.HasPrefix(t, "@router") {
 				elements := strings.TrimSpace(t[len("@router"):])
 				e1 := strings.SplitN(elements, " ", 2)
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
 	}