diff --git a/.gitignore b/.gitignore
index 099f2fd47d39d88f235d9ff107e248fbdc942fbb..174f39620a3a67eaad565eae9eaff3b03614809e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,29 +1,20 @@
-# ---> Java
-# Compiled class file
-*.class
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
 
-# Log file
-*.log
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
 
-# BlueJ files
-*.ctxt
+*.attach*
 
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-replay_pid*
-
-/token-checker-interface/target/
-/token-checker-server/target/
-/.idea/
+.idea
+*.iml
+*.orig
+.vscode/
diff --git a/README.md b/README.md
index 4f64cf4734085166eab6aa7e908baea050f3a62a..482ef604b57d20f18e9a02200fc6820e62f7e27c 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,23 @@
-# token-checker
+# Token Checker
 
+Zentraler Dienst um (Saml-)Token auf Gültigkeit zu prüfen. Unterstützt werden aktuell folgende Tokens:
+
+* Mein Unternehmenskonto (MUK) SamlToken
+
+## Schnittstelle
+
+### Request
+    CheckToken
+      token: String
+      
+### Response
+	* tokenValid: boolean
+	* oneOf:
+		* tokenAttributes
+			* postkorbId: String
+			* trustLevel: String
+			* otherFields: Repeated:
+			    * name: String
+	    			* value: String
+	    	* checkError
+	    		* message: String