very quick modification to allow base64 and path fields
Merge branch 'base64-field'