Added 1st feature
Merge branch 'release/1.0'