Feature/backport holodeck pr26

Applies https://github.com/shaunsephton/holodeck/pull/26 to your fork.