Updated with the latest .zip provided by Hiroyuki