quick and dirty fix for posistions in lecture
Merge origin/master