Resolves #6. Updates #9