Merge branch 'release/1.0'
Merge branch 'develop'
Adding mapping
Merge branch 'master' into release/0.1
Merge branch 'release/0.1' into develop