Singleton progress
Merge branch 'master' of https://github.com/Gruppe53/vif.git