bug fixing
Merge branch 'master' of github.com:giulioungaretti/opendatahacklab2014