Merge pull request #1 from meantime/master

A small amount of simplification
Make it still compile in non-C99
Fix header name and minor typos in README