Merge pull request #574 from JulianHBuecher/reservation-feature