Included merge builds into build listing

Also some refactor and cleaning
json as method
Merge pull request #6 from figarocorso/mjulian/zero-builds-fix

Mjulian/zero builds fix