Closes #245