Fix #23

I'm not totally of what I'm doing, but I think that's ok.
Update CHANGES