merge changes from Rourke750's git