Merge branch 'master' into 'master'

New expectations from me Emil Rode (soon to be supreme ruler of the known world)

After I fixed the file I can now upload it... **yey**

See merge request !13