fixed build.
Merge branch 'release/v0.3.1'