Version 1
Merge branch 'patrikv1' into dev