Bringing repo up to date with muhrix's