Add Jurgen's contribution and some fixes#779

jurgengjoncari wants to merge 1 commit intovikingeducation:mastervikingeducation/prep_basics:masterfrom

jurgengjoncari:masterCopy head branch name to clipboard