Closes #51