Add rmagic and uploader class
Merge remote-tracking branch 'origin/master'
Add rmagic and uploader class