Issue #18 - Support for other types in addition to 'upload'