This commit resolves #38