Done here
Done here

Closes #20
Closes #14

I'm sending a first version provisionally. If there are major changes, @mariosky can submit another next Sunday.

JJ/2016-ppsn-benchmark-ec,JJ/2016-ppsn-benchmark-ec,JJ/2016-ea-languages-wcci,JJ/2016-ea-languages-wcci,geneura-papers/2016-ea-languages-PPSN,JJ/2016-ea-languages-wcci,JJ/2016-ppsn-benchmark-ec,JJ/2016-ea-languages-wcci,geneura-papers/2016-ea-languages-PPSN,geneura-papers/2016-ea-languages-PPSN,JJ/2016-ea-languages-wcci,JJ/2016-ppsn-benchmark-ec,geneura-papers/2016-ea-languages-PPSN,JJ/2016-ppsn-benchmark-ec,geneura-papers/2016-ea-languages-PPSN,JJ/2016-ea-languages-wcci,geneura-papers/2016-ea-languages-PPSN,JJ/2016-ea-languages-wcci,JJ/2016-ppsn-benchmark-ec,JJ/2016-ppsn-benchmark-ec,JJ/2016-ea-languages-wcci,geneura-papers/2016-ea-languages-PPSN,JJ/2016-ppsn-benchmark-ec,geneura-papers/2016-ea-languages-PPSN,JJ/2016-ea-languages-wcci,geneura-papers/2016-ea-languages-PPSN,geneura-papers/2016-ea-languages-PPSN,geneura-papers/2016-ea-languages-PPSN,JJ/2016-ea-languages-wcci,JJ/2016-ppsn-benchmark-ec,JJ/2016-ppsn-benchmark-ec