Merge Dev with Master

Before we continue to work on dinner we will push the current version to the master.

It should work...