Closes #35