Merge pull request #21 from mdt0093/wait-staff

Updating wait-staff with latest code from master