Items

Merge items branch with master, also fixed describe function.