Merge tag '1.0-alpha1' into develop

Version 1.0-alpha1
Use the new naming conventions for keys.
Merge branch 'release/1.0-alpha2'