This resolves #13

Works for now