Merge pull request #19 from fschulze/master

Fixes and tests.
Check contents of generated files.
Update to latest releases.