Merge branch 'develop' into channels

Makefile

@@ -6,6 +6,7 @@ GOSRC_RECEIVERS  := $(wildcard receivers/*.go)
 GOSRC_INTERNAL   := $(wildcard internal/*/*.go)
 GOSRC            := $(GOSRC_APP) $(GOSRC_COLLECTORS) $(GOSRC_SINKS) $(GOSRC_RECEIVERS) $(GOSRC_INTERNAL)
 
+
 .PHONY: all
 all: $(APP)
 
@@ -24,9 +25,9 @@ fmt:
 	go fmt $(GOSRC_COLLECTORS)
 	go fmt $(GOSRC_SINKS)
 	go fmt $(GOSRC_RECEIVERS)
-	go fmt $(GOSRC_INTERNAL)
 	go fmt $(GOSRC_APP)
-	find . -name "*.go" -exec go fmt {} \;
+  @for F in $(GOSRC_INTERNAL); do go fmt $$F; done
+
 
 # Examine Go source code and reports suspicious constructs
 .PHONY: vet