Closes #390