diff --git a/.gitignore b/.gitignore
index 0105cb345b..7a3b8360bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
 # generated files
 bin/
 gen/
+target/
 
 # Local configuration file (sdk path, etc)
 local.properties
diff --git a/SETUP.md b/SETUP.md
index d527d4feaa..8c1ebd9aa7 100644
--- a/SETUP.md
+++ b/SETUP.md
@@ -1,22 +1,36 @@
   
-  If you want to start development of ownCloud android client you have two way to do so:
+  If you want to start development of ownCloud first download required files, then compile using console or Eclipse, finally create pull request:
+  
+  1. Fork and download android/develop repository:
+  
+  -  Navigate to https://github.com/owncloud/android, click fork.
+  -  Clone your new repo: "git clone git@github.com:YOURGITHUBNAME/android.git"
+  -  Checkout remote develop branch: "git checkout -b develop remotes/origin/develop"
 
-  1. Building with console:
+  2. Building with console:
 
   -  Use setup_env.sh or setup_env.bat
-  -  NOTE: You must have git, ant/bin, android/tools in your enviroment path
+  -  NOTE: You must have mvn, git, ant/bin, android/tools, and 'platforms-tools' in your enviroment path
+  -  Now you can create APK using "mvn package"
   
-  2. Building with eclipse:
-
-  -  Run ant clean debug
-  -  Open Eclipse and import *actionbarsherlock/library* project to your workspace
-  -  NOTE: You must have 'tools' and 'platforms-tools' in your path in order to run setup_env.sh 
-
-	 After those actions you should be good to go.
-
-	 HAVE FUN!
-
+  3. Building with eclipse:
 
+  -  Open Eclipse and create new "Android Project from Existing Code". As root choose *actionbarsherlock/library*
+  -  Increase Android API level until project compiles. 14 should work. bin/library.jar needs to be created!
+  -  Import OwnCloud Android project.
+  -  Increase Android API level to 17.
+  -  Clean all projects.
+  -  After those actions you should be good to go. HAVE FUN!
+  -  TODO: How to build for older devices?
+  
+  4. Create pull request:
+  
+  -  Commit your changes locally: "git commit -a"
+  -  Push your changes to your Github repo: "git push"
+  -  Browse to https://github.com/YOURGITHUBNAME/android/pulls and issue pull request
+  -  Click "Edit" and set "base:develop"
+  -  Again, click "Edit" and set "compare:develop"
+  -  Enter description and send pull request.
 
 
 
diff --git a/setup_env.bat b/setup_env.bat
index c0bfeb4f3d..85f45086ff 100644
--- a/setup_env.bat
+++ b/setup_env.bat
@@ -1,7 +1,8 @@
 git submodule init
 git submodule update
-android.bat update project -p actionbarsherlock\library --target 1
-android.bat update project -p . --target 1
-cp third_party\android-support-library\android-support-v4.jar actionbarsherlock\library\libs\android-support-v4.jar
+call android.bat update project -p actionbarsherlock\library --target 1
+call android.bat update project -p . --target 1
+copy /Y third_party\android-support-library\android-support-v4.jar actionbarsherlock\library\libs\android-support-v4.jar
 cd tests
-android.bat update test-project -m .. -p .
\ No newline at end of file
+call android.bat update test-project -m .. -p .
+cd ..