#15 added support for #load