diff --git a/Makefile b/Makefile
index 256f44496..4c3f79917 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 BINARY=sonic-server
 
 build:
-	go build -x ${BINARY}
+	go build
 
 .PHONY: clean
 clean:
@@ -15,7 +15,7 @@ setup:
 
 .PHONY: run
 run:
-	@reflex -s -r "\.go$$" -- go run .
+	@reflex -s -r "(\.go$$|sonic.toml)" -- go run .
 
 .PHONY: test
 test:
diff --git a/README.md b/README.md
index aa5967da0..95b8dd061 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,13 @@ $ export SONIC_MUSICFOLDER="/path/to/your/iTunes Library.xml"
 $ make run
 ```
 
-The server should start listening on port 4533.
+The server should start listening for requests. The default configuration is:
+
+- Port: `4533`
+- User: `anyone`
+- Password: `wordpass`
+
+To override this or any other configuration, create a file named `sonic.toml` in the project folder. For all options see the [configuration.go](conf/configuration.go) file
 
 ### Development Environment