v2
Merge pull request #22 from dannymeldrum/master

v2