Closes #248