This commit closes #59