Merge branch 'hotfix/Issue#12'
Merge branch 'release/release'
Solve Issue#13
Merge branch 'hotfix/Issue#13' into develop