Merge tag 'v1.0' into develop

v1.0 v1.0
Second file added
Second file added
Merge pull request #1 from felix123/develop

Develop