diff --git a/build_scripts/compile_anselm.sh b/build_scripts/compile_anselm.sh
old mode 100644
new mode 100755
diff --git a/build_scripts/compile_salomon.sh b/build_scripts/compile_salomon.sh
old mode 100644
new mode 100755
index 5978e64819560b7e10fc81aa5e258db236bfaa75..fb4ea5f9232f7d361f93a9ef761476d01fe3c15a
--- a/build_scripts/compile_salomon.sh
+++ b/build_scripts/compile_salomon.sh
@@ -1,11 +1,15 @@
-#!/usr/bin/sh
+#!/usr/bin/bash
 
-ml CMake/3.13.1
-ml Armadillo
-ml Boost
-ml OpenBLAS
-ml GCCcore/9.1.0
+current_dir=$(pwd)
+script_dir=$(dirname $0)
 
-./clean.sh
+if [ $script_dir = '.' ]
+then
+    script_dir="$current_dir"
+fi
 
-./build.sh
+source $(script_dir)/load_salomon_modules.inc
+
+#./clean.sh
+
+$(pwd)/build.sh
diff --git a/build_scripts/load_salomon_modules.inc b/build_scripts/load_salomon_modules.inc
new file mode 100644
index 0000000000000000000000000000000000000000..c81027364053c301599beb6eba3dd7c00c2a9019
--- /dev/null
+++ b/build_scripts/load_salomon_modules.inc
@@ -0,0 +1,6 @@
+ml CMake/3.13.1
+ml Armadillo
+ml Boost
+ml OpenBLAS
+ml GCCcore/9.1.0
+