Fixed version number
Merge branch 'v0.4' into v0.5
Fixed version number