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