Closes #44