TODO's VE
Merge branch 'master' of github.com:roboime/pfc-jan-bramigk