Fix 29

Fixes issues https://github.com/bluecherrydvr/bluecherry-client/issues/29 and https://github.com/bluecherrydvr/bluecherry-client/issues/38