syntax-highligting improved and killed a typo
changed title
merged with master