alpha release 1

Merge dev-wip to dev