Merge pull request #6 from jsatt/master

add unicode and better validation to ContentMap