Issue 46

Yes, this is just a rebased commit, so it copied the change back in.