Fixes issue #2, also adds default functionality like dicts