Index: build.sh
===================================================================
diff -u -r01c31fe0aaab4a86cc9ffb5e0b498f76e1f62f35 -r3598a284ecdfaf270b1fcff57866f99a69bcb4e7
--- build.sh	(.../build.sh)	(revision 01c31fe0aaab4a86cc9ffb5e0b498f76e1f62f35)
+++ build.sh	(.../build.sh)	(revision 3598a284ecdfaf270b1fcff57866f99a69bcb4e7)
@@ -17,10 +17,21 @@
 OLD_NAME="leahi_dialin-1.0.0-py3-none-any.whl"
 NEW_NAME="leahi_dialin-1.0.0"
 
-NEW_NAME+="-$1"               # Append the Bamboo Build Number (Incremental version)
-NEW_NAME+="+$2"               # Append the Project Checkout Branch Name
-NEW_NAME+=".$3"               # Append the Build Commit Hash
-NEW_NAME+="-py3-none-any.whl" # Append the metadata and the file extension name
+if [ -n "$1" ]; then
+  NEW_NAME+="-$1"               # Append the Bamboo Build Number (Incremental version)
+else
+  NEW_NAME+="-000"
+fi
+if [ -n "$2" ]; then
+  NEW_NAME+=".$2"               # Append the Project Checkout Branch Name;  Note: Don't use '-' as separator after the version as it messes up the tags 
+else
+  NEW_NAME+=".local"
+fi
+if [ -n "$3" ]; then
+  NEW_NAME+=".$3"               # Append the Build Commit Hash;  Note: Don't use '-' as separator after the version as it messes up the tags 
+fi
+NEW_NAME+="-py3-none-any.whl"   # -py3-none-any are tags needed for pip after the version information
+
 NEW_NAME=$(sed -e "s/\//_/g" <<< "$NEW_NAME") # Replaces backslashes in the branch name parameter with underscore
 
 rm -rf dist/