diff --git a/CHANGELOG b/CHANGELOG
index 35aa4035c4..b7f35173ba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,8 @@
 
 * fixed issue #103: Should we cleanup the directory structure
 
+* fixed issue #112: do not accept document with duplicate attribute names
+
 * added new MRuby version (2012-06-02)
 
 * added --log.filter
diff --git a/Makefile.unittests b/Makefile.unittests
index 1aaa704f13..e828281351 100644
--- a/Makefile.unittests
+++ b/Makefile.unittests
@@ -47,6 +47,7 @@ VOCPORT := $(shell printf "3%04d" `expr $(PID) % 10000`)
 VOCHOST := 127.0.0.1
 SERVER_OPT := --javascript.startup-directory ./js --javascript.modules-path ./js/server/modules:./js/common/modules --javascript.action-directory ./js/actions/system
 CLIENT_OPT := --javascript.startup-directory ./js --javascript.modules-path ./js/client/modules:./js/common/modules --no-colors --quiet
+STARTFILE := $(VOCDIR)/startup
 
 .PHONY: start-server
 
@@ -65,14 +66,10 @@ start-server:
 
 	($(VALGRIND) @builddir@/bin/arangod "$(VOCDIR)" $(SERVER_OPT) --pid-file $(PIDFILE) --watch-process $(PID) --server.http-port $(VOCHOST):$(VOCPORT) && rm -rf "$(VOCDIR)") &
 
-	@curl -s http://$(VOCHOST):$(VOCPORT)/_api/version > /dev/null || sleep 2
-	@curl -s http://$(VOCHOST):$(VOCPORT)/_api/version > /dev/null || sleep 2
-	@curl -s http://$(VOCHOST):$(VOCPORT)/_api/version > /dev/null || sleep 2
-	@curl -s http://$(VOCHOST):$(VOCPORT)/_api/version > /dev/null || sleep 2
-
-	curl -sS http://$(VOCHOST):$(VOCPORT)/_api/version
-
-	@if [ "$(VALGRIND)" != "" ]; then sleep 60; fi
+	while [ ! -s "$(STARTFILE)" ]; do curl -s "http://$(VOCHOST):$(VOCPORT)/_api/version" > "$(STARTFILE)" || sleep 2; done
+	@rm "$(STARTFILE)"
+	@echo "server has been started."
+	@if [ "$(VALGRIND)" != "" ]; then echo "adding valgrind memorial time..."; sleep 30; else sleep 2; fi
 	@echo
 
 ################################################################################
diff --git a/README.md b/README.md
index b0e9575f1b..c1b342aab7 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
 
 We recently started a new open source project - a nosql database
 called AvocadoDB which became ArangoDB in May 2012.  ArangoDB is
-currently pre-alpha. We want to have a version 1 ready by end of May
-2012, a multi server version is planned for the third quarter of
-2012. For details see the roadmap.
+currently available as an alpha version. 
+We want to have a stable version 1 ready soon. A multi server version is planned 
+for the third quarter of 2012. For details see the roadmap.
 
 Key features include:
 
@@ -16,6 +16,7 @@ Key features include:
 * Free index choice: use the correct index for your problem, be it a skip list or a n-gram search
 * Configurable durability: let the application decide if it needs more durability or more performance
 * No-nonsense storage: ArangoDB uses all of the power of modern storage hardware, like SSD and large caches
+* Powerful query language (AQL) to retrieve data 
 * It is open source (Apache Licence 2.0)
 
 For more in-depth information
@@ -48,7 +49,7 @@ The ArangoDB shell will be install as
 Start the server:
 
     > mkdir /tmp/vocbase
-    > ./arangod /tmp/vocbase
+    > bin/arangod /tmp/vocbase
     2012-03-30T12:54:19Z [11794] INFO ArangoDB (version 0.x.y) is ready for business
     2012-03-30T12:54:19Z [11794] INFO HTTP client port: 127.0.0.1:8529
     2012-03-30T12:54:19Z [11794] INFO HTTP admin port: 127.0.0.1:8530
@@ -56,7 +57,7 @@ Start the server:
 
 Start the shell in another windows:
 
-    > ./arangosh
+    > bin/arangosh
                                            _     
       __ _ _ __ __ _ _ __   __ _  ___  ___| |__  
      / _` | '__/ _` | '_ \ / _` |/ _ \/ __| '_ \