Feature/stefans branch

fuck yeah openshift