Fixed #37, and removed some debugging-related code.