Closes #47