I've also applied other minor refactorings and fixed a broken spec.
Attach a file by drag & drop or click to upload
