diff --git a/libpit/project.properties b/libpit/project.properties
index afcc55b..616718f 100755
--- a/libpit/project.properties
+++ b/libpit/project.properties
@@ -1,11 +1,20 @@
+<<<<<<< HEAD
 #Wed, 19 May 2010 08:06:01 -0500
+=======
+#Fri, 27 May 2011 12:38:44 -0500
+>>>>>>> 3278213... Fixed bug, pit-cli now trims input directory.
 #Sat Apr 24 17:08:00 CDT 2010
 build.dir=build
 src.dir=src
 lib.shared.dir=../shared-libs
 test.dir=test
+<<<<<<< HEAD
 build.number=1
 expected.application.version=2.3.1
+=======
+build.number=4
+expected.application.version=2.5.1
+>>>>>>> 3278213... Fixed bug, pit-cli now trims input directory.
 lib.dir=lib
 release.dir=release
 release.jar=pit-${application.version}.jar
diff --git a/libpit/release/pit-2.5.1.jar b/libpit/release/pit-2.5.1.jar
new file mode 100644
index 0000000..f73d2c4
Binary files /dev/null and b/libpit/release/pit-2.5.1.jar differ
diff --git a/pit-cli/lib/pit-2.5.1.jar b/pit-cli/lib/pit-2.5.1.jar
new file mode 100644
index 0000000..f73d2c4
Binary files /dev/null and b/pit-cli/lib/pit-2.5.1.jar differ
diff --git a/pit-cli/project.properties b/pit-cli/project.properties
index 2e428ae..c7564bf 100755
--- a/pit-cli/project.properties
+++ b/pit-cli/project.properties
@@ -1,9 +1,18 @@
+<<<<<<< HEAD
+=======
+#Fri, 27 May 2011 12:38:58 -0500
+>>>>>>> 3278213... Fixed bug, pit-cli now trims input directory.
 #Sat Feb 27 03:01:15 CST 2010
 build.dir=build
 src.dir=src
 build.jar=pit-cli-${application.version}.${build.number}.jar
+<<<<<<< HEAD
 build.number=1
 expected.application.version=2.1.0
+=======
+build.number=5
+expected.application.version=2.5.1
+>>>>>>> 3278213... Fixed bug, pit-cli now trims input directory.
 lib.dir=lib
 release.dir=release
 release.jar=pit-cli-${application.version}.jar
diff --git a/pit-cli/src/com/jdbernard/pit/PersonalIssueTrackerCLI.groovy b/pit-cli/src/com/jdbernard/pit/PersonalIssueTrackerCLI.groovy
index 5a1f770..b1a1748 100644
--- a/pit-cli/src/com/jdbernard/pit/PersonalIssueTrackerCLI.groovy
+++ b/pit-cli/src/com/jdbernard/pit/PersonalIssueTrackerCLI.groovy
@@ -53,7 +53,13 @@ def statusList = ['new', 'validation_required']
 if (opts.t) statusList = opts.t.split(/[,\s]/)
 statusList = statusList.collect { Status.toStatus(it) }
 
-if (opts.d) workingDir = new File(opts.d)
+if (opts.d) {
+    workingDir = new File(opts.d.trim())
+    if (!workingDir.exists()) {
+        println "Directory '${workingDir}' does not exist."
+        return -1
+    }
+}
 
 def EOL = System.getProperty('line.separator')
 
diff --git a/release/pit-cli-2.5.1.jar b/release/pit-cli-2.5.1.jar
new file mode 100644
index 0000000..ef00a45
Binary files /dev/null and b/release/pit-cli-2.5.1.jar differ