merge v3 into master

let's take it live and make updates / fixes