diff --git a/doc/RELEASE_NOTES.txt b/doc/RELEASE_NOTES.txt
index 930116120eaf03250759c176bf34f3520b7c42a7..478823a73fcd12f7d6cdb6be4294719f53f774b0 100644
--- a/doc/RELEASE_NOTES.txt
+++ b/doc/RELEASE_NOTES.txt
@@ -1,4 +1,4 @@
-Release 1.1 ()
+Release 1.1 (03/10/2017)
 =============================
 
 - Introduced integration with Beamline Scheduling System:
@@ -10,14 +10,19 @@ Release 1.1 ()
     with a given beamline proposal
 - Added the following functionality for managing DAQs:
   - Max. run time specification causes DAQ to be stopped automatically
-  - Target directory specification causes files to be uploaded into
+  - Destination directory specification causes files to be uploaded into
     a specific directory relative to experiment root path
   - Upload data/target directory on exit specify upload of the given
     directory automatically after DAQ completes
 - Added the following functionality for managing uploads:
-  - Target directory specification causes files to be uploaded into
+  - Destination directory specification causes files to be uploaded into
     a specific directory relative to experiment root path
+- Introduced framework for higher level beamline specific tools 
 - Introduced sphinx as python API documentation framework
+- Resolved possible timeout issue when starting DAQ or directory upload 
+  with a directory containing large number of files
+- Simplified data directory command line option for beamlines that use 
+  gridftp (via DM_DATA_DIRECTORY_MAP environment variable)
 
 Release 1.0 (01/31/2017)
 =============================
diff --git a/setup.sh b/setup.sh
index 786fab9fc389b585d3cb9a2efea0b31e4c77f2a2..8e5c86ecd289c8967853723e0f3e199867b496dc 100644
--- a/setup.sh
+++ b/setup.sh
@@ -60,6 +60,9 @@ prependPathIfDirExists $DM_OPT_DIR/postgresql/$DM_HOST_ARCH/bin
 prependPathIfDirExists $DM_OPT_DIR/java/$DM_HOST_ARCH/bin
 prependPathIfDirExists $DM_OPT_DIR/ant/bin
 prependPathIfDirExists $DM_ROOT_DIR/bin
+if [ ! -z $DM_STATION_NAME ]; then
+    prependPathIfDirExists $DM_ROOT_DIR/bin/$DM_STATION_NAME
+fi
 PATH=.:$PATH
 export PATH