Fixes #10 - Fixing Paperclip