v6
Merge pull request #4 from jeremyhewett/Dani

v6