Added a client for the dispenser
Merge remote-tracking branch 'origin/master'