diff --git a/.fuse_hidden0003358400000017 b/.fuse_hidden0003358400000017
new file mode 100644
index 00000000..64fa72d4
Binary files /dev/null and b/.fuse_hidden0003358400000017 differ
diff --git a/.gitignore b/.gitignore
index fd012d99..a33bef8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,7 @@ lib/swig/eggs
 eggs
 lib/swig/wheelhouse/
 wheelhouse/
-
+*fuse*
 *~
 
 #Copy of libskycoin.h in pyskycoin
diff --git a/Makefile b/Makefile
index eb76ba88..52e4b6fc 100644
--- a/Makefile
+++ b/Makefile
@@ -65,33 +65,33 @@ build-swig: ## Generate Python C module from SWIG interfaces
 	rm -f $(LIBSWIG_PYSKYCOIN)/swig/pyskycoin_wrap.c
 	rm -f $(LIBSWIG_PYSKYCOIN)/swig/include/swig.h
 	cp -v gopath/src/github.com/skycoin/skycoin/include/swig.h $(LIBSWIG_PYSKYCOIN)/swig/include/
-	swig -python -Ilib/swig/swig/include -I$(INCLUDE_DIR) -outdir $(LIBSWIG_PYSKYCOIN)/skycoin/ -o $(LIBSWIG_PYSKYCOIN)/swig/pyskycoin_wrap.c $(LIBSWIG_DIR)/pyskycoin.i
+	swig -python -Ilib/swig/swig/include -I$(shell pwd)/gopath/src/github.com/skycoin/skycoin/include -outdir $(LIBSWIG_PYSKYCOIN)/skycoin/ -o $(LIBSWIG_PYSKYCOIN)/swig/pyskycoin_wrap.c $(LIBSWIG_DIR)/pyskycoin.i
 
 develop: ## Install PySkycoin for development
-	(cd $(PYTHON_CLIENT_DIR) && $(PYTHON) setup.py develop) \
+	$(PYTHON) $(PYTHON_CLIENT_DIR)/setup.py develop \
 	(cd $(LIBSWIG_PYSKYCOIN) && $(PYTHON) setup.py develop)
 
 build-libc-swig: build-libc build-swig
 
 build: build-libc-swig ## Build PySkycoin Python package
-	(cd $(LIBSWIG_PYSKYCOIN) && $(PYTHON) setup.py build)
+	$(PYTHON) $(LIBSWIG_PYSKYCOIN)/setup.py build
 	(cd $(PYTHON_CLIENT_DIR) && $(PYTHON) setup.py build)
 
 test-ci: ## Run tests on (Travis) CI build
-#    (cd $(LIBSWIG_PYSKYCOIN) && tox)
+	(cd $(PYTHON_CLIENT_DIR) && tox)
 	(cd $(PYTHON_CLIENT_DIR) && tox)
 
 
 test: build-libc build-swig develop ## Run project test suite
-	(cd $(PYTHON_CLIENT_DIR) && $(PYTHON) setup.py test) \
+	$(PYTHON) $(PYTHON_CLIENT_DIR)/setup.py test \
 	(cd $(LIBSWIG_PYSKYCOIN) && $(PYTHON) setup.py test)
 
 sdist: ## Create source distribution archive
-	(cd $(LIBSWIG_PYSKYCOIN) && $(PYTHON) setup.py sdist --formats=gztar) \
+	$(PYTHON) $(LIBSWIG_PYSKYCOIN)/setup.py sdist --formats=gztar \
 	(cd $(PYTHON_CLIENT_DIR) && $(PYTHON) setup.py sdist --formats=gztar)
 
 bdist_wheel: ## Create architecture-specific binary wheel distribution archive
-	(cd $(LIBSWIG_PYSKYCOIN) && $(PYTHON) setup.py bdist_wheel)/
+	$(PYTHON) $(LIBSWIG_PYSKYCOIN)/setup.py bdist_wheel \
 	(cd $(PYTHON_CLIENT_DIR) && $(PYTHON) setup.py bdist_wheel)
 
 # FIXME: After libskycoin 32-bits binaries add bdist_manylinux_i686