Issue #22 #18
Small Bug fix
Issue: #23
Added upload support. Also some minor changes