Fix file path names
Merge remote-tracking branch 'origin/0.1.6_rc1' into 0.1.6_rc1