Minor refactoring, add specs, changes arguments to use keywords.
Attach a file by drag & drop or click to upload
