Clean version - except for bug described in README...