Assets 2

Planned as a last patch release before 0.6.0