Merged John's 0.6 script with my fork after accepting the transferred project