Closes #58