diff --git a/Makefile b/Makefile
index 54a9fe6..498fc28 100644
--- a/Makefile
+++ b/Makefile
@@ -15,16 +15,17 @@ help:
 	@echo "  composer-up         Update php composer"
 	@echo "  docker-start        Create and start containers"
 	@echo "  docker-stop         Stop all services"
-	@echo "  gen-certs            Generate SSL certificates"
+	@echo "  gen-certs           Generate SSL certificates"
+	@echo "  logs                Follow log output"
 	@echo "  mysql-dump          Create backup of whole database"
 	@echo "  mysql-restore       Restore backup from whole database"
 	@echo "  test                Test application"
 
 init:
-	@cp -n $(shell pwd)/web/app/composer.json.dist $(shell pwd)/web/app/composer.json
+	@$(shell cp -n $(shell pwd)/web/app/composer.json.dist $(shell pwd)/web/app/composer.json 2> /dev/null)
 
 apidoc:
-	@docker exec -i $(shell docker-compose ps -q php) php $(shell pwd)/app/vendor/apigen/apigen/bin/apigen generate -s app/src -d app/doc
+	@docker exec -i $(shell docker-compose ps -q php) php ./app/vendor/apigen/apigen/bin/apigen generate -s app/src -d app/doc
 	@make resetOwner
 
 clean:
@@ -52,6 +53,9 @@ docker-stop:
 gen-certs:
 	@docker run --rm -v $(shell pwd)/etc/ssl:/certificates -e "SERVER=localhost" jacoelho/generate-certificate
 
+logs:
+	@docker-compose logs -f
+
 mysql-dump:
 	@mkdir -p $(MYSQL_DUMPS_DIR)
 	@docker exec -i $(shell docker-compose ps -q mysqldb) mysqldump --all-databases -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" > $(MYSQL_DUMPS_DIR)/db.sql