Fixes
Merge branch 'links' of github.com:aherranz/jsongen into links