Merge dev to master

brace yourself alpha is coming