Index: build.sh
===================================================================
diff -u -r83dfc943fa4fa3d99c74d86b4b9449df19022b44 -r3598a284ecdfaf270b1fcff57866f99a69bcb4e7
--- build.sh	(.../build.sh)	(revision 83dfc943fa4fa3d99c74d86b4b9449df19022b44)
+++ build.sh	(.../build.sh)	(revision 3598a284ecdfaf270b1fcff57866f99a69bcb4e7)
@@ -18,16 +18,22 @@
 NEW_NAME="leahi_dialin-1.0.0"
 
 if [ -n "$1" ]; then
-  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
-  NEW_NAME=$(sed -e "s/\//_/g" <<< "$NEW_NAME") # Replaces backslashes in the branch name parameter with underscore
 else
-  NEW_NAME="$OLD_NAME"
+  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/
 python3 setup.py bdist_wheel
 if [ $? -ne 0 ]; then echo "Error building package. Exiting..."; exit 1; fi