This fixes #30 and resolves #30, then close issue #30