Closes #41 and I suppose it closes #38 too. I really hope it does.