diff --git a/bin/gremlin.sh b/bin/gremlin.sh
index 28da54a..9566e95 100644
--- a/bin/gremlin.sh
+++ b/bin/gremlin.sh
@@ -1,6 +1,8 @@
 #!/bin/bash

-CP=$( echo `dirname $0`/../lib/*.jar . | sed 's/ /:/g')
+ORIENTDB_DIR="YOUR_ORIENTDB_INSTALLATION_PATH"
+
+CP=$( echo $ORIENTDB_DIR/lib/*.jar . | sed 's/ /:/g')
 #echo $CP

 # Find Java
diff --git a/bin/orientdb.sh b/bin/orientdb.sh
index e8cc970..be3ec19 100644
--- a/bin/orientdb.sh
+++ b/bin/orientdb.sh
@@ -4,7 +4,6 @@

 # You have to SET the OrientDB installation directory here
 ORIENTDB_DIR="YOUR_ORIENTDB_INSTALLATION_PATH"
-ORIENTDB_USER="USER_YOU_WANT_ORIENTDB_RUN_WITH"

 usage() {
 	echo "Usage: `basename $0`: <start|stop|status>"
@@ -20,7 +19,7 @@ start() {
 	fi
 	echo "Starting OrientDB server daemon..."
 	cd "$ORIENTDB_DIR/bin"
-	su -c "cd \"$ORIENTDB_DIR/bin\"; /usr/bin/nohup ./server.sh 1>../log/orientdb.log 2>../log/orientdb.err &" - $ORIENTDB_USER
+	/usr/bin/nohup ./orientdb-server 1>../log/orientdb.log 2>../log/orientdb.err &
 }

 stop() {
@@ -32,7 +31,7 @@ stop() {
 	fi
 	echo "Stopping OrientDB server daemon..."
 	cd "$ORIENTDB_DIR/bin"
-	su -c "cd \"$ORIENTDB_DIR/bin\"; /usr/bin/nohup ./shutdown.sh 1>>../log/orientdb.log 2>>../log/orientdb.err &" - $ORIENTDB_USER
+	/usr/bin/nohup ./orientdb-shutdown 1>>../log/orientdb.log 2>>../log/orientdb.err &
 }

 status() {