diff --git a/tutorial/Makefile.am b/tutorial/Makefile.am
index 2b9be52..ab968b2 100755
--- a/tutorial/Makefile.am
+++ b/tutorial/Makefile.am
@@ -62,21 +62,21 @@
 # generate html for ThriftTest.thrift
 #
 all-local:
-	$(top_builddir)/compiler/cpp/thrift --gen html -r $(top_srcdir)/tutorial/tutorial.thrift
+    $(top_builddir)/compiler/cpp/thrift --gen html -r $(top_srcdir)/tutorial/tutorial.thrift
 endif
 
 # Any folders or files not listed above being added to SUBDIR need to be placed here in
 # EXTRA_DIST to be included in the release
 EXTRA_DIST = \
-	as3 \
-	csharp \
-	d \
-	delphi \
-	erl \
-	hs \
-	ocaml \
-	perl \
-	php \
-	shared.thrift \
-	tutorial.thrift \
-	README.md
+    as3 \
+    csharp \
+    d \
+    delphi \
+    erl \
+    hs \
+    ocaml \
+    perl \
+    php \
+    shared.thrift \
+    tutorial.thrift \
+    README.md
diff --git a/tutorial/c_glib/Makefile.am b/tutorial/c_glib/Makefile.am
index 24075dd..a1d28ff 100755
--- a/tutorial/c_glib/Makefile.am
+++ b/tutorial/c_glib/Makefile.am
@@ -26,53 +26,53 @@
 
 .NOTPARALLEL:
 noinst_LTLIBRARIES = \
-	libtutorialgencglib.la
+    libtutorialgencglib.la
 
 nodist_libtutorialgencglib_la_SOURCES = \
-	gen-c_glib/calculator.c \
-	gen-c_glib/calculator.h \
-	gen-c_glib/shared_service.c \
-	gen-c_glib/shared_service.h \
-	gen-c_glib/shared_types.c \
-	gen-c_glib/shared_types.h \
-	gen-c_glib/tutorial_types.c \
-	gen-c_glib/tutorial_types.h
+    gen-c_glib/calculator.c \
+    gen-c_glib/calculator.h \
+    gen-c_glib/shared_service.c \
+    gen-c_glib/shared_service.h \
+    gen-c_glib/shared_types.c \
+    gen-c_glib/shared_types.h \
+    gen-c_glib/tutorial_types.c \
+    gen-c_glib/tutorial_types.h
 
 libtutorialgencglib_la_LIBADD = \
-	$(top_builddir)/lib/c_glib/libthrift_c_glib.la
+    $(top_builddir)/lib/c_glib/libthrift_c_glib.la
 
 
 noinst_PROGRAMS = \
-	tutorial_server \
-	tutorial_client
+    tutorial_server \
+    tutorial_client
 
 tutorial_server_SOURCES = \
-	c_glib_server.c
+    c_glib_server.c
 
 tutorial_server_LDADD = \
-	libtutorialgencglib.la \
-	$(top_builddir)/lib/c_glib/libthrift_c_glib.la
+    libtutorialgencglib.la \
+    $(top_builddir)/lib/c_glib/libthrift_c_glib.la
 
 tutorial_client_SOURCES = \
-	c_glib_client.c
+    c_glib_client.c
 
 tutorial_client_LDADD = \
-	libtutorialgencglib.la \
-	$(top_builddir)/lib/c_glib/libthrift_c_glib.la
+    libtutorialgencglib.la \
+    $(top_builddir)/lib/c_glib/libthrift_c_glib.la
 
 
 $(nodist_libtutorialgencglib_la_SOURCES): $(top_srcdir)/tutorial/tutorial.thrift
-	$(THRIFT) --gen c_glib -r $<
+    $(THRIFT) --gen c_glib -r $<
 
 clean-local:
-	$(RM) -r gen-c_glib
+    $(RM) -r gen-c_glib
 
 tutorialserver: all
-	./tutorial_server
+    ./tutorial_server
 
 tutorialclient: all
-	./tutorial_client
+    ./tutorial_client
 
 EXTRA_DIST = \
-	c_glib_server.c \
-	c_glib_client.c
+    c_glib_server.c \
+    c_glib_client.c
diff --git a/tutorial/cpp/Makefile.am b/tutorial/cpp/Makefile.am
index 918adb2..bff2417 100755
--- a/tutorial/cpp/Makefile.am
+++ b/tutorial/cpp/Makefile.am
@@ -19,40 +19,40 @@
 .NOTPARALLEL:
 noinst_LTLIBRARIES = libtutorialgencpp.la
 nodist_libtutorialgencpp_la_SOURCES = \
-	gen-cpp/Calculator.cpp \
-	gen-cpp/Calculator.h \
-	gen-cpp/SharedService.cpp \
-	gen-cpp/SharedService.h \
-	gen-cpp/shared_constants.cpp \
-	gen-cpp/shared_constants.h \
-	gen-cpp/shared_types.cpp \
-	gen-cpp/shared_types.h \
-	gen-cpp/tutorial_constants.cpp \
-	gen-cpp/tutorial_constants.h \
-	gen-cpp/tutorial_types.cpp \
-	gen-cpp/tutorial_types.h
+    gen-cpp/Calculator.cpp \
+    gen-cpp/Calculator.h \
+    gen-cpp/SharedService.cpp \
+    gen-cpp/SharedService.h \
+    gen-cpp/shared_constants.cpp \
+    gen-cpp/shared_constants.h \
+    gen-cpp/shared_types.cpp \
+    gen-cpp/shared_types.h \
+    gen-cpp/tutorial_constants.cpp \
+    gen-cpp/tutorial_constants.h \
+    gen-cpp/tutorial_types.cpp \
+    gen-cpp/tutorial_types.h
 
 
 
 libtutorialgencpp_la_LIBADD = $(top_builddir)/lib/cpp/libthrift.la
 
 noinst_PROGRAMS = \
-	TutorialServer \
-	TutorialClient
+    TutorialServer \
+    TutorialClient
 
 TutorialServer_SOURCES = \
-	CppServer.cpp
+    CppServer.cpp
 
 TutorialServer_LDADD = \
-	libtutorialgencpp.la \
-	$(top_builddir)/lib/cpp/libthrift.la
+    libtutorialgencpp.la \
+    $(top_builddir)/lib/cpp/libthrift.la
 
 TutorialClient_SOURCES = \
-	CppClient.cpp
+    CppClient.cpp
 
 TutorialClient_LDADD = \
-	libtutorialgencpp.la \
-	$(top_builddir)/lib/cpp/libthrift.la
+    libtutorialgencpp.la \
+    $(top_builddir)/lib/cpp/libthrift.la
 
 #
 # Common thrift code generation rules
@@ -60,21 +60,21 @@
 THRIFT = $(top_builddir)/compiler/cpp/thrift
 
 gen-cpp/Calculator.cpp gen-cpp/tutorial_types.cpp gen-cpp/tutorial_constants.cpp: $(top_srcdir)/tutorial/tutorial.thrift
-	$(THRIFT) --gen cpp -r $<
+    $(THRIFT) --gen cpp -r $<
 
 AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(LIBEVENT_CPPFLAGS) -I$(top_srcdir)/lib/cpp/src -Igen-cpp
 AM_CXXFLAGS = -Wall
 AM_LDFLAGS = $(BOOST_LDFLAGS) $(LIBEVENT_LDFLAGS)
 
 clean-local:
-	$(RM) -r gen-cpp
+    $(RM) -r gen-cpp
 
 tutorialserver: all
-	./TutorialServer
+    ./TutorialServer
 
 tutorialclient: all
-	./TutorialClient
+    ./TutorialClient
 
 EXTRA_DIST = \
-	CppClient.cpp \
-	CppServer.cpp
+    CppClient.cpp \
+    CppServer.cpp
diff --git a/tutorial/go/Makefile.am b/tutorial/go/Makefile.am
index a707d5d..6a6ee51 100644
--- a/tutorial/go/Makefile.am
+++ b/tutorial/go/Makefile.am
@@ -20,42 +20,42 @@
 THRIFT = $(top_builddir)/compiler/cpp/thrift
 
 gen-go/tutorial/calculator.go gen-go/shared/shared_service.go: $(top_srcdir)/tutorial/tutorial.thrift
-	$(THRIFT) --gen go -r $<
+    $(THRIFT) --gen go -r $<
 
 all-local: gen-go/tutorial/calculator.go
 
 
 check: src/git.apache.org/thrift.git/lib/go/thrift
-	$(THRIFT) -r --gen go $(top_srcdir)/tutorial/tutorial.thrift
-	cp -r gen-go/* src/
-	GOPATH=`pwd` $(GO) build ./...
-	GOPATH=`pwd` $(GO) build -o go-tutorial src/*.go
-	GOPATH=`pwd` $(GO) build -o calculator-remote src/tutorial/calculator-remote/calculator-remote.go
+    $(THRIFT) -r --gen go $(top_srcdir)/tutorial/tutorial.thrift
+    cp -r gen-go/* src/
+    GOPATH=`pwd` $(GO) build ./...
+    GOPATH=`pwd` $(GO) build -o go-tutorial src/*.go
+    GOPATH=`pwd` $(GO) build -o calculator-remote src/tutorial/calculator-remote/calculator-remote.go
 
 src/git.apache.org/thrift.git/lib/go/thrift:
-	mkdir -p src/git.apache.org/thrift.git/lib/go
-	ln -sf $(realpath $(top_srcdir)/lib/go/thrift) src/git.apache.org/thrift.git/lib/go/thrift
+    mkdir -p src/git.apache.org/thrift.git/lib/go
+    ln -sf $(realpath $(top_srcdir)/lib/go/thrift) src/git.apache.org/thrift.git/lib/go/thrift
 
 tutorialserver: all
-	GOPATH=`pwd` $(GO) run src/*.go -server=true
+    GOPATH=`pwd` $(GO) run src/*.go -server=true
 
 tutorialclient: all
-	GOPATH=`pwd` $(GO) run src/*.go 
+    GOPATH=`pwd` $(GO) run src/*.go
 
 tutorialsecureserver: all
-	GOPATH=`pwd` $(GO) run src/*.go -server=true -secure=true
+    GOPATH=`pwd` $(GO) run src/*.go -server=true -secure=true
 
 tutorialsecureclient: all
-	GOPATH=`pwd` $(GO) run src/*.go -secure=true
+    GOPATH=`pwd` $(GO) run src/*.go -secure=true
 
 clean-local:
-	$(RM) -r gen-* src/shared src/tutorial src/git.apache.org go-tutorial calculator-remote
+    $(RM) -r gen-* src/shared src/tutorial src/git.apache.org go-tutorial calculator-remote
 
 EXTRA_DIST = \
-	src/client.go \
-	src/handler.go \
-	src/server.go \
-	src/main.go \
-	server.crt \
-	server.key
+    src/client.go \
+    src/handler.go \
+    src/server.go \
+    src/main.go \
+    server.crt \
+    server.key
 
diff --git a/tutorial/hs/Makefile.am b/tutorial/hs/Makefile.am
index f274eb6..943cb23 100755
--- a/tutorial/hs/Makefile.am
+++ b/tutorial/hs/Makefile.am
@@ -18,22 +18,22 @@
 #
 
 all-local:
-	$(top_builddir)/compiler/cpp/thrift --gen hs -r $(top_srcdir)/tutorial/tutorial.thrift
-	$(CABAL) install
+    $(top_builddir)/compiler/cpp/thrift --gen hs -r $(top_srcdir)/tutorial/tutorial.thrift
+    $(CABAL) install
 
 install-exec-hook:
-	$(CABAL) install
+    $(CABAL) install
 
 # Make sure this doesn't fail if Haskell is not configured.
 clean-local:
-	$(CABAL) clean
-	$(RM) -r gen-*
+    $(CABAL) clean
+    $(RM) -r gen-*
 
 check-local:
-	$(CABAL) check
+    $(CABAL) check
 
 tutorialserver: all
-	dist/build/HaskellServer/HaskellServer
+    dist/build/HaskellServer/HaskellServer
 
 tutorialclient: all
-	dist/build/HaskellClient/HaskellClient
+    dist/build/HaskellClient/HaskellClient
diff --git a/tutorial/java/Makefile.am b/tutorial/java/Makefile.am
index 95908b1..e755c0a 100755
--- a/tutorial/java/Makefile.am
+++ b/tutorial/java/Makefile.am
@@ -21,25 +21,25 @@
 
 # Make sure this doesn't fail if ant is not configured.
 clean-local:
-	ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \
-	$$ANT $(ANT_FLAGS) clean
+    ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \
+    $$ANT $(ANT_FLAGS) clean
 
 all-local:
-	$(ANT) $(ANT_FLAGS) compile
+    $(ANT) $(ANT_FLAGS) compile
 
 check-local: all
-	$(ANT) $(ANT_FLAGS) test
+    $(ANT) $(ANT_FLAGS) test
 
 tutorial: all
-	$(ANT) $(ANT_FLAGS) tutorial
+    $(ANT) $(ANT_FLAGS) tutorial
 
 tutorialserver: all
-	$(ANT) $(ANT_FLAGS) tutorialserver
+    $(ANT) $(ANT_FLAGS) tutorialserver
 
 tutorialclient: all
-	$(ANT) $(ANT_FLAGS) tutorialclient
+    $(ANT) $(ANT_FLAGS) tutorialclient
 
 EXTRA_DIST = \
-	build.xml \
-	src \
-	README.md
+    build.xml \
+    src \
+    README.md
diff --git a/tutorial/js/Makefile.am b/tutorial/js/Makefile.am
index 3fe0888..2a899d0 100755
--- a/tutorial/js/Makefile.am
+++ b/tutorial/js/Makefile.am
@@ -21,19 +21,19 @@
 
 # Make sure this doesn't fail if ant is not configured.
 clean-local:
-	ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \
-	$$ANT $(ANT_FLAGS) clean
+    ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \
+    $$ANT $(ANT_FLAGS) clean
 
 all-local:
-	$(ANT) $(ANT_FLAGS) compile
+    $(ANT) $(ANT_FLAGS) compile
 
 check-local: all
-	$(ANT) $(ANT_FLAGS) test
+    $(ANT) $(ANT_FLAGS) test
 
 tutorialserver: all
-	$(ANT) $(ANT_FLAGS) tutorialserver
+    $(ANT) $(ANT_FLAGS) tutorialserver
 
 EXTRA_DIST = \
-	build.xml \
-	src \
-	tutorial.html
+    build.xml \
+    src \
+    tutorial.html
diff --git a/tutorial/nodejs/Makefile.am b/tutorial/nodejs/Makefile.am
index ecf3b2b..0113e1a 100644
--- a/tutorial/nodejs/Makefile.am
+++ b/tutorial/nodejs/Makefile.am
@@ -20,28 +20,28 @@
 THRIFT = $(top_builddir)/compiler/cpp/thrift
 
 gen-nodejs/Calculator.js gen-nodejs/SharedService.js: $(top_srcdir)/tutorial/tutorial.thrift
-	$(THRIFT) --gen js:node -r $<
+    $(THRIFT) --gen js:node -r $<
 
 all-local: gen-nodejs/Calculator.js
 
 tutorialserver: all
-	NODE_PATH="$(top_builddir)/lib/nodejs:$(top_builddir)/lib/nodejs/lib:$(NODEPATH)" $(NODEJS) NodeServer.js
+    NODE_PATH="$(top_builddir)/lib/nodejs:$(top_builddir)/lib/nodejs/lib:$(NODEPATH)" $(NODEJS) NodeServer.js
 
 tutorialclient: all
-	NODE_PATH="$(top_builddir)/lib/nodejs:$(top_builddir)/lib/nodejs/lib:$(NODEPATH)" $(NODEJS) NodeClient.js
+    NODE_PATH="$(top_builddir)/lib/nodejs:$(top_builddir)/lib/nodejs/lib:$(NODEPATH)" $(NODEJS) NodeClient.js
 
 tutorialserver_promise: all
-	NODE_PATH="$(top_builddir)/lib/nodejs:$(top_builddir)/lib/nodejs/lib:$(NODEPATH)" $(NODEJS) NodeServerPromise.js
+    NODE_PATH="$(top_builddir)/lib/nodejs:$(top_builddir)/lib/nodejs/lib:$(NODEPATH)" $(NODEJS) NodeServerPromise.js
 
 tutorialclient_promise: all
-	NODE_PATH="$(top_builddir)/lib/nodejs:$(top_builddir)/lib/nodejs/lib:$(NODEPATH)" $(NODEJS) NodeClientPromise.js
+    NODE_PATH="$(top_builddir)/lib/nodejs:$(top_builddir)/lib/nodejs/lib:$(NODEPATH)" $(NODEJS) NodeClientPromise.js
 
 
 clean-local:
-	$(RM) -r gen-*
+    $(RM) -r gen-*
 
 EXTRA_DIST = \
-	NodeServer.js \
-	NodeClient.js \
-	NodeServerPromise.js \
-	NodeClientPromise.js
+    NodeServer.js \
+    NodeClient.js \
+    NodeServerPromise.js \
+    NodeClientPromise.js
diff --git a/tutorial/py.tornado/Makefile.am b/tutorial/py.tornado/Makefile.am
index 6ac6023..97e7027 100755
--- a/tutorial/py.tornado/Makefile.am
+++ b/tutorial/py.tornado/Makefile.am
@@ -20,19 +20,19 @@
 THRIFT = $(top_builddir)/compiler/cpp/thrift
 
 gen-py.tornado/tutorial/Calculator.py gen-py.tornado/shared/SharedService.py: $(top_srcdir)/tutorial/tutorial.thrift
-	$(THRIFT) --gen py:tornado -r $<
+    $(THRIFT) --gen py:tornado -r $<
 
 all-local: gen-py.tornado/tutorial/Calculator.py
 
 tutorialserver: all
-	${PYTHON} PythonServer.py
+    ${PYTHON} PythonServer.py
 
 tutorialclient: all
-	${PYTHON} PythonClient.py
+    ${PYTHON} PythonClient.py
 
 clean-local:
-	$(RM) -r gen-*
+    $(RM) -r gen-*
 
 EXTRA_DIST = \
-	PythonServer.py \
-	PythonClient.py
+    PythonServer.py \
+    PythonClient.py
diff --git a/tutorial/py.twisted/Makefile.am b/tutorial/py.twisted/Makefile.am
index c6cbd45..5dac658 100755
--- a/tutorial/py.twisted/Makefile.am
+++ b/tutorial/py.twisted/Makefile.am
@@ -20,20 +20,20 @@
 THRIFT = $(top_builddir)/compiler/cpp/thrift
 
 gen-py/tutorial/Calculator.py gen-py/shared/SharedService.py: $(top_srcdir)/tutorial/tutorial.thrift
-	$(THRIFT) --gen py:twisted -r $<
+    $(THRIFT) --gen py:twisted -r $<
 
 all-local: gen-py/tutorial/Calculator.py
 
 tutorialserver: all
-	${PYTHON} PythonServer.py
+    ${PYTHON} PythonServer.py
 
 tutorialclient: all
-	${PYTHON} PythonClient.py
+    ${PYTHON} PythonClient.py
 
 clean-local:
-	$(RM) -r gen-*
+    $(RM) -r gen-*
 
 EXTRA_DIST = \
-	PythonClient.py \
-	PythonServer.py \
-	PythonServer.tac
+    PythonClient.py \
+    PythonServer.py \
+    PythonServer.tac
diff --git a/tutorial/py/Makefile.am b/tutorial/py/Makefile.am
index 2397a12..51f89c8 100755
--- a/tutorial/py/Makefile.am
+++ b/tutorial/py/Makefile.am
@@ -20,19 +20,19 @@
 THRIFT = $(top_builddir)/compiler/cpp/thrift
 
 gen-py/tutorial/Calculator.py gen-py/shared/SharedService.py: $(top_srcdir)/tutorial/tutorial.thrift
-	$(THRIFT) --gen py -r $<
+    $(THRIFT) --gen py -r $<
 
 all-local: gen-py/tutorial/Calculator.py
 
 tutorialserver: all
-	${PYTHON} PythonServer.py
+    ${PYTHON} PythonServer.py
 
 tutorialclient: all
-	${PYTHON} PythonClient.py
+    ${PYTHON} PythonClient.py
 
 clean-local:
-	$(RM) -r gen-*
+    $(RM) -r gen-*
 
 EXTRA_DIST = \
-	PythonServer.py \
-	PythonClient.py
+    PythonServer.py \
+    PythonClient.py
diff --git a/tutorial/rb/Makefile.am b/tutorial/rb/Makefile.am
index 369e903..f4942a9 100755
--- a/tutorial/rb/Makefile.am
+++ b/tutorial/rb/Makefile.am
@@ -20,19 +20,19 @@
 THRIFT = $(top_builddir)/compiler/cpp/thrift
 
 gen-py/calculator.rb gen-py/shared_service.rb: $(top_srcdir)/tutorial/tutorial.thrift
-	$(THRIFT) --gen rb -r $<
+    $(THRIFT) --gen rb -r $<
 
 all-local: gen-py/calculator.rb
 
 tutorialserver: all
-	${RUBY} RubyServer.rb
+    ${RUBY} RubyServer.rb
 
 tutorialclient: all
-	${RUBY} RubyClient.rb
+    ${RUBY} RubyClient.rb
 
 clean-local:
-	$(RM) -r gen-*
+    $(RM) -r gen-*
 
 EXTRA_DIST = \
-	RubyServer.rb \
-	RubyClient.rb
+    RubyServer.rb \
+    RubyClient.rb