Resolves #13, #5