Added loading. Fixes #28