Merge pull request #543 from ndawe/master

[MRG] root2hdf5 and setup.py improvements