v4
Merge pull request #15 from dannymeldrum/master

v4