Feature 32

This fixes issue https://github.com/bluecherrydvr/bluecherry-client/issues/32