Update to v.0.5.0
Fix Conflict