Fixed return type
Merge branch 'v0.4' into v0.5