Fix issue #19, name with whitespace is working fine