This commit resolves #1