Reimplemented an hour's worth of work after git screweed everything up. Changed to v1.0-Beta.6 for the sake of the auto-updater