Demo branch 2

@SvenHanke pls review