Working version

This version is already deployed on our server and works like a charm. Some improvements are still possible. Please see the Issues for more information.