Resolves #11