Merge tag 'v0.3.1' into develop

Interface enhancements
Before decorators
Finally decorates with Draper
Complete win over decorators