The wrong version actually got moved to this branch when I tried to clean some things up. This version should be correct :-)