added ! to valid characters - fix #17