Changed file names
Merge branch 'release/0.9.0'