Added return value to main
Merge v0.1