Closes #180