Added return value for main
Fixed return type
Fixed return type
Merge branch 'v0.4' into v0.5
Merge v0.4