Closes #305