html entitiziation of values, minor changes
Merge branch 'master' of https://github.com/changokun/m