Resolves #9 #10