Added matcher-next
Switched name reading to a limited character set.