[Closes #39]