Server-side changes
Pulled in updates
Finalizing 0.5.0
Merge branch '0.5.0'