Development Autumn 2013
Signed-off-by: ulrich3110 <ulrich3110@gmail.com>