Resolves #69 and #70