More parsing spaghetti straight from the standard
Merge branch 'master' of https://github.com/sphair/ClanLib