Closes #236