Closes #33