Closes #45