Fixes issue #4 - strange chars in machine name