I hope this commit resolves #7