diff --git a/pom.xml b/pom.xml
index 5151385ec0dd30d55410d1f44a852d9056ba1158..77d7b13b3aa8001fe50feaaa5a8af5171237b978 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>au.edu.unimelb.mf</groupId>
 	<artifactId>unimelb-mf-clients</artifactId>
-	<version>0.6.7</version>
+	<version>0.6.8</version>
 	<packaging>jar</packaging>
 	<name>unimelb-mf-clients</name>
 	<url>https://gitlab.unimelb.edu.au/resplat-mediaflux/unimelb-mf-clients</url>
diff --git a/src/main/java/unimelb/mf/client/instrument/Upload.java b/src/main/java/unimelb/mf/client/instrument/Upload.java
index 2a1d416c885761ce40917c972cd8be7e6cffbb4f..aec92a084c60e0d6e187258ff1217dcb72a1cb4c 100644
--- a/src/main/java/unimelb/mf/client/instrument/Upload.java
+++ b/src/main/java/unimelb/mf/client/instrument/Upload.java
@@ -126,8 +126,8 @@ public class Upload {
     }
 
     public final boolean pathContextMatches(String srcPath) {
-        if (_pathContext != null) {
-            return _pathContext.equals(srcPath);
+        if (_pathContext != null && srcPath!=null) {
+            return _pathContext.replaceFirst("/+$","").equals(srcPath.replaceFirst("/+$", ""));
         }
         return false;
     }
diff --git a/src/main/scripts/unix/unimelb-mf-instrument-upload-find b/src/main/scripts/unix/unimelb-mf-instrument-upload-find
new file mode 100644
index 0000000000000000000000000000000000000000..f089c1eecb8d4744d65e657f406375e4ddefd00c
--- /dev/null
+++ b/src/main/scripts/unix/unimelb-mf-instrument-upload-find
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# ${ROOT}/bin/
+BIN=$(dirname ${BASH_SOURCE[0]})
+
+# current directory
+CWD=$(pwd)
+
+# ${ROOT}/
+ROOT=$(cd ${BIN}/../../ && pwd && cd ${CWD})
+
+# ${ROOT}/lib/
+LIB=${ROOT}/lib
+
+# ${ROOT}/lib/unimelb-mf-clients.jar
+JAR=${LIB}/unimelb-mf-clients.jar
+
+# check if unimelb-mf-clients.jar exists
+[[ ! -f $JAR ]] && echo "${JAR} is not found." >&2 && exit 2
+
+# JRE included?
+JRE=${ROOT}/jre
+if [[ -d ${JRE} ]]; then
+  JAVA=${JRE}/bin/java
+else
+  JAVA=$(which java)
+  [[ -z ${JAVA} ]] && echo "could not find java" && exit 1
+fi
+
+# execute the command
+$JAVA -XX:+UseG1GC -XX:+UseStringDeduplication -Xmx1g -cp "${JAR}" unimelb.mf.client.instrument.cli.InstrumentUploadFind ${1+"$@"}
diff --git a/src/main/scripts/windows/unimelb-mf-instrument-upload-find.cmd b/src/main/scripts/windows/unimelb-mf-instrument-upload-find.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..cdc8a446a51ee893c9b9951bbc8f90075efa7e4f
--- /dev/null
+++ b/src/main/scripts/windows/unimelb-mf-instrument-upload-find.cmd
@@ -0,0 +1,21 @@
+@echo off
+
+setlocal
+
+pushd "%~dp0..\..\"
+set "ROOT=%cd%"
+popd
+
+set "JRE=%ROOT%\jre"
+
+if exist "%JRE%\" (
+    set "JAVA=%JRE%\bin\java"
+) else (
+    set JAVA=java
+)
+
+set JAR=%ROOT%\lib\unimelb-mf-clients.jar
+
+"%JAVA%" -XX:+UseG1GC -XX:+UseStringDeduplication -Xmx1g -cp "%JAR%" unimelb.mf.client.instrument.cli.InstrumentUploadFind %*
+
+endlocal