diff --git a/.gitignore b/.gitignore
index 2f379e5..a81937e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@ CaroloCup-CameraPlayback
 *~
 .depend
 data
-build
+build*
diff --git a/Dockerfile b/Dockerfile
index aae5a92..5a88d86 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,6 +35,18 @@ RUN apt-get -y install libopencv-dev
 RUN apt-get clean
 RUN apt-get autoremove
 
+RUN apt-get update -y
+RUN apt-get upgrade -y
+
+RUN apt-get install -y wget
+
+RUN wget -O - -q http://opendavinci.cse.chalmers.se/opendavinci.cse.chalmers.se.gpg.key | apt-key add -
+RUN echo "deb http://opendavinci.cse.chalmers.se/ubuntu/ trusty main" >> /etc/apt/sources.list
+
+RUN apt-get update -y
+
+RUN apt-get install -y opendavinci-odlib
+
 # Set locale (fix the locale warnings)
 RUN localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || :
 
diff --git a/Makefile b/Makefile
index 6878630..a1fe503 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,31 @@
-# Make variables to create the Docker image.
+# Makefile - Makefile to create a Docker image.
+# Copyright (C) 2015  Christian Berger
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 PRODUCT=carolocup-cameraplayback
-VERSION=v3
+VERSION=v2.0.4
 REPOSITORY=seresearch
 BUILDLOG=build.log
 
 docker:
 	docker build -t $(REPOSITORY)/$(PRODUCT):$(VERSION) . | tee $(BUILDLOG) || exit 1
 
+docker-tag-latest:
+	docker tag -f $(shell tail -1 $(BUILDLOG) | cut -f3 -d" ") $(REPOSITORY)/$(PRODUCT):latest
+
+push:
+	docker push $(REPOSITORY)/$(PRODUCT):$(VERSION) && docker push $(REPOSITORY)/$(PRODUCT):latest
+
diff --git a/README.rst b/README.md
similarity index 87%
rename from README.rst
rename to README.md
index 0d44a9d..cdfc40d 100644
--- a/README.rst
+++ b/README.md
@@ -19,6 +19,11 @@ you can run it as follows::
 
     $ ./CaroloCup-CameraPlayback myRecording.rec
 
+If you have the corresponding ground truth data at hand,
+just specify the .csv file as additional parameter::
+
+    $ ./CaroloCup-CameraPlayback myRecording.rec myRecording.csv
+
 Alternatively, you can also use our Docker image where
 we provide a ready-to-use binary image. As our image
 opens a window to play back the video data, you need to
@@ -32,5 +37,5 @@ you have a folder named ``data`` where the *.rec files
 are located to be mapped into the Docker container on
 its execution::
 
-    $ docker run -ti -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix -v ${PWD}/data:/opt/data seresearch/carolocup-cameraplayback:latest /CaroloCup-CameraPlayback /opt/data/myRecording.rec
+    $ docker run -ti -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix -v ${PWD}/data:/opt/data seresearch/carolocup-cameraplayback:latest /CaroloCup-CameraPlayback /opt/data/myRecording.rec /opt/data/myRecording.csv