v4 Branching

Branching to v4 for tidy up and better version compatibility