Closes #383