Closes #38. See #37 also.