diff --git a/commands/hugo.go b/commands/hugo.go
index 21f4f0f90..b52e85332 100644
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -19,6 +19,7 @@ import (
 	"github.com/mostafah/fsync"
 	"github.com/spf13/cobra"
 	"github.com/spf13/hugo/hugolib"
+	"github.com/spf13/nitro"
 	"log"
 	"os"
 	"path/filepath"
@@ -66,6 +67,7 @@ func init() {
 	HugoCmd.PersistentFlags().BoolVar(&UglyUrls, "uglyurls", false, "if true, use /filename.html instead of /filename/")
 	HugoCmd.PersistentFlags().StringVarP(&BaseUrl, "base-url", "b", "", "hostname (and path) to the root eg. http://spf13.com/")
 	HugoCmd.PersistentFlags().StringVar(&CfgFile, "config", "", "config file (default is path/config.yaml|json|toml)")
+	HugoCmd.PersistentFlags().BoolVar(&nitro.AnalysisOn, "stepAnalysis", false, "display memory and timing of different steps of the program")
 	HugoCmd.Flags().BoolVarP(&BuildWatch, "watch", "w", false, "watch filesystem for changes and recreate as needed")
 }
 
diff --git a/hugolib/site.go b/hugolib/site.go
index 3511b6a13..25ee4d3dc 100644
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -31,7 +31,7 @@ import (
 	"time"
 )
 
-var DefaultTimer = nitro.Initalize()
+var DefaultTimer *nitro.B
 
 func MakePermalink(base *url.URL, path *url.URL) *url.URL {
 	return base.ResolveReference(path)
@@ -78,6 +78,10 @@ type SiteInfo struct {
 	Config     *Config
 }
 
+func init() {
+	DefaultTimer = nitro.Initalize()
+}
+
 func (s *Site) timerStep(step string) {
 	if s.timer == nil {
 		s.timer = DefaultTimer