re #5 - Adds docs, naming change.