Merge pull request #21 from vivekmshah/vivek

Paperclip integration
Merge branch 'master' into vivek