Fix headers
Merge branch 'release/v0.1.7'