Resolves #42 and resolves #44