diff --git a/.gitignore b/.gitignore
index 7140b1b7a..be5d34fee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ capybara-*.html
 /tmp
 /db/*.sqlite3
 /public/system
+/public/assets
 /coverage/
 /spec/tmp
 **.orig
diff --git a/bin/robot b/bin/robot
index ec2b8f83b..195a6b3dd 100755
--- a/bin/robot
+++ b/bin/robot
@@ -3,6 +3,10 @@
 #
 # Build and run everything for automatic tests 
 #
+
+# cd to current script directory
+cd "$(dirname "$0")"
+
 git pull origin master
 bundle install --deployment