fixed #108
Merge branch 'development' of github.com:AlexanderStreng/HUniversal-Production-Utrecht into development