Modify for Version 1.5
Merge branch 'feature/version-1.5'