Merge pull request #75 from lhl/master

Added "bare" options for username and hostname
Performance improvements in username, hostname segments